commit af6d36f23a359a6d1ae6629c084655d776bfe2c5
author Eric Laurent <elaurent@google.com> Sat Jun 20 13:14:09 2020 -0700
committer Eric Laurent <elaurent@google.com> Sat Jun 20 20:25:57 2020 +0000
tree ef3d18d83d3a9c3eca74302031f5bca53234d0b5
parent f00b91b986fca9d87b900ed0e34c963bb85519f1

audio policy: do not consider telephony TX device as a local device

Exclude playback over AUDIO_DEVICE_OUT_TELEPHONY_TX when evaluating
local playback activity on a HW module as this is a virtual device
injecting audio to telephony TX path and as such not interfering
with local playback.

Bug: 159480161
Test: repro steps in bug
Change-Id: I8cd27acc0033725fa66f95c7661c58b38d31532a

services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp

diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
index d5272bc..d6d472b 100644
--- a/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
+++ b/services/audiopolicy/common/managerdefinitions/src/AudioOutputDescriptor.cpp
@@ -690,7 +690,9 @@
         const sp<SwAudioOutputDescriptor> outputDesc = this->valueAt(i);
         if (outputDesc->isActive(volumeSource, inPastMs, sysTime)
                 && (!(outputDesc->devices()
-                        .containsDeviceAmongTypes(getAllOutRemoteDevices())))) {
+                        .containsDeviceAmongTypes(getAllOutRemoteDevices())
+                        || outputDesc->devices()
+                            .onlyContainsDevicesWithType(AUDIO_DEVICE_OUT_TELEPHONY_TX)))) {
             return true;
         }
     }
@@ -722,7 +724,11 @@
         const sp<SwAudioOutputDescriptor> otherDesc = valueAt(i);
         if (desc->sharesHwModuleWith(otherDesc) &&
                 otherDesc->isStrategyActive(ps, inPastMs, sysTime)) {
-            return true;
+            if (desc == otherDesc
+                    || !otherDesc->devices()
+                            .onlyContainsDevicesWithType(AUDIO_DEVICE_OUT_TELEPHONY_TX)) {
+                return true;
+            }
         }
     }
     return false;