commit e7d13b373dd55172bbaca0ab2d268263445c0d8e
author Linux Build Service Account <lnxbuild@localhost> Tue Aug 21 11:07:29 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Aug 21 11:07:29 2018 -0700
tree 6db2c0ec388b5eb26b5c2fff87eb6fc56c9024d0
parent 01cc04f1a835ef18d13baee55e2986fa55dfd6b7
parent 0118daaf28b8cdfb8e3648a4c27ec08ae8dffc97

Merge "policy: update voice volume after output device is changed."

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index ab933a0..6bc3d1e 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1042,6 +1042,9 @@
     }
     if (mEngine->getPhoneState() == AUDIO_MODE_IN_CALL && hasPrimaryOutput()) {
         audio_devices_t newDevice = getNewOutputDevice(mPrimaryOutput, true /*fromCache*/);
+        if (forceVolumeReeval && (newDevice != AUDIO_DEVICE_NONE)) {
+            applyStreamVolumes(mPrimaryOutput, newDevice, delayMs, true);
+        }
         waitMs = updateCallRouting(newDevice, delayMs);
     }
     // Use reverse loop to make sure any low latency usecases (generally tones)
@@ -1057,10 +1060,11 @@
         if ((mEngine->getPhoneState() != AUDIO_MODE_IN_CALL) || (outputDesc != mPrimaryOutput)) {
             waitMs = setOutputDevice(outputDesc, newDevice, (newDevice != AUDIO_DEVICE_NONE),
                                      delayMs);
-        }
-        if (forceVolumeReeval && (newDevice != AUDIO_DEVICE_NONE)) {
-            applyStreamVolumes(outputDesc, newDevice, waitMs, true);
-        }
+
+            if (forceVolumeReeval && (newDevice != AUDIO_DEVICE_NONE)) {
+                applyStreamVolumes(outputDesc, newDevice, waitMs, true);
+            }
+         }
     }
 
     Vector<sp <AudioInputDescriptor> > activeInputs = mInputs.getActiveInputs();