Merge "audio policy: re enable setForceUse for system apps." into pi-dev am: fb4e361a9e

am: c99607b993

Change-Id: If78c24dc339365c9a232b10727e58decf35eaaa5

media/libaudioclient/IAudioPolicyService.cpp

@@ -876,7 +876,8 @@ status_t BnAudioPolicyService::onTransact(
         case SET_DEVICE_CONNECTION_STATE:
         case HANDLE_DEVICE_CONFIG_CHANGE:
         case SET_PHONE_STATE:
-        case SET_FORCE_USE:
+//FIXME: Allow SET_FORCE_USE calls from system apps until a better use case routing API is available
+//      case SET_FORCE_USE:
         case INIT_STREAM_VOLUME:
         case SET_STREAM_VOLUME:
         case REGISTER_POLICY_MIXES:

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

@@ -121,9 +121,11 @@ status_t AudioPolicyService::setForceUse(audio_policy_force_use_t usage,
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }
-    if (!settingsAllowed()) {
+
+    if (!modifyAudioRoutingAllowed()) {
         return PERMISSION_DENIED;
     }
+
     if (usage < 0 || usage >= AUDIO_POLICY_FORCE_USE_CNT) {
         return BAD_VALUE;
     }