commit e963d9d6832ce89aff1f0535f4f7b62a335067c8
author Eric Laurent <elaurent@google.com> Wed Jun 24 19:42:24 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 24 19:42:24 2020 +0000
tree 89e76e8044c3cccbc654781eb0372eb154fe5aa4
parent cac3ba5c6e49b19e8a8ce842f839ae8a48679faa
parent 8847f120b6fd52b852d7770f67b58af725f5b43e

Merge "audio policy: do not consider telephony TX device as a local device" into rvc-dev am: 8847f120b6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11931587

Change-Id: Ic9ede3f6cfbd13e99b1c4d26e607f6b8401cc299

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;