commit f579db5aa9e1cbbe5a8b7689e319913e154cda3b
author François Gaffie <francois.gaffie@renault.com> Tue Nov 13 11:25:16 2018 +0100
committer Eric Laurent <elaurent@google.com> Sat Feb 02 10:43:22 2019 -0800
tree 8cbb24a261decd14aad3fcbfa4e5e32abe607686
parent c005e569c7bae3f8c49660c9388c3076046069f5

audiopolicy: exclusive Preferred Device

It allows to force the routing of music during call without
affecting clients that does not explicitely requested to use
another device than the one decided by the policy during call
(which is TELEPHONY TX).

It fixes differently Bug 111467967.

Test: make

Change-Id: I6034f0d2568e1b2a1e600d9ae1453fd0c60ed02e
Signed-off-by: François Gaffie <francois.gaffie@renault.com>

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 771f62a..126a5f7 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -916,7 +916,8 @@
                                                  uid_t uid,
                                                  const audio_config_t *config,
                                                  audio_output_flags_t *flags,
-                                                 audio_port_handle_t *selectedDeviceId)
+                                                 audio_port_handle_t *selectedDeviceId,
+                                                 bool *isRequestedDeviceForExclusiveUse)
 {
     DeviceVector outputDevices;
     const audio_port_handle_t requestedPortId = *selectedDeviceId;
@@ -980,7 +981,7 @@
         isInCall()) {
         if (requestedPortId != AUDIO_PORT_HANDLE_NONE) {
             *flags = (audio_output_flags_t)AUDIO_OUTPUT_FLAG_INCALL_MUSIC;
-            // @todo: provide another solution (separated CL)
+            *isRequestedDeviceForExclusiveUse = true;
         }
     }
 
@@ -1030,8 +1031,9 @@
     }
     const audio_port_handle_t requestedPortId = *selectedDeviceId;
     audio_attributes_t resultAttr;
+    bool isRequestedDeviceForExclusiveUse = false;
     status_t status = getOutputForAttrInt(&resultAttr, output, session, attr, stream, uid,
-            config, flags, selectedDeviceId);
+            config, flags, selectedDeviceId, &isRequestedDeviceForExclusiveUse);
     if (status != NO_ERROR) {
         return status;
     }
@@ -1045,7 +1047,7 @@
         new TrackClientDescriptor(*portId, uid, session, resultAttr, clientConfig,
                                   requestedPortId, *stream,
                                   mEngine->getProductStrategyForAttributes(resultAttr),
-                                  *flags);
+                                  *flags, isRequestedDeviceForExclusiveUse);
     sp<SwAudioOutputDescriptor> outputDesc = mOutputs.valueFor(*output);
     outputDesc->addClient(clientDesc);
 
@@ -3633,8 +3635,10 @@
         config.format = sourceDesc->config().format;
         audio_output_flags_t flags = AUDIO_OUTPUT_FLAG_NONE;
         audio_port_handle_t selectedDeviceId = AUDIO_PORT_HANDLE_NONE;
+        bool isRequestedDeviceForExclusiveUse = false;
         getOutputForAttrInt(&resultAttr, &output, AUDIO_SESSION_NONE,
-                &attributes, &stream, sourceDesc->uid(), &config, &flags, &selectedDeviceId);
+                &attributes, &stream, sourceDesc->uid(), &config, &flags,
+                &selectedDeviceId, &isRequestedDeviceForExclusiveUse);
         if (output == AUDIO_IO_HANDLE_NONE) {
             ALOGV("%s no output for device %08x", __FUNCTION__, sinkDevices.types());
             return INVALID_OPERATION;