commit 9c8e042f1f838e3a7e59b6bfa143e073403c7206
author qctecmdr <qctecmdr@localhost> Fri May 15 22:08:07 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri May 15 22:08:07 2020 -0700
tree ac10da3c3d747fbd5ffbfae4a0e54ee8311607ec
parent 99ac7075c96f73fa69e32806eabc8a9000179df4
parent c8798808027a7ab9c91ad7687c3aca29338d2c17

Merge "policy: fix voice volume is mismatch after headset remove"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 2dd6a3c..5ab6067 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -322,7 +322,8 @@
         const DeviceVector msdOutDevices = getMsdAudioOutDevices();
         for (size_t i = 0; i < mOutputs.size(); i++) {
             sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);
-            if ((mEngine->getPhoneState() != AUDIO_MODE_IN_CALL) || (desc != mPrimaryOutput)) {
+            if (desc->isActive() && ((mEngine->getPhoneState() != AUDIO_MODE_IN_CALL) ||
+                (desc != mPrimaryOutput))) {
                 DeviceVector newDevices = getNewOutputDevices(desc, true /*fromCache*/);
                 // do not force device change on duplicated output because if device is 0, it will
                 // also force a device 0 for the two outputs it is duplicated to which may override