commit fe71fe569311ece86f501b25507c2bb093a83277
author Linux Build Service Account <lnxbuild@quicinc.com> Sun Nov 12 23:47:18 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Nov 12 23:47:18 2017 -0800
tree c6dfd38f53f4e3f9669afbb363051327e69c0aee
parent 8838daf8adfe97de3ca7b0f8392d45f8ad9c3d1b
parent e08be63b164199eefab4233f53ac9cf8d83f8b29

Merge "policy_hal: restore device if it differs from the stopped output"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index 6e5e076..5d7f9c1 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1069,7 +1069,7 @@
                         outputDesc->sharesHwModuleWith(desc) &&
                         (newDevice != desc->device())) {
                         audio_devices_t dev = getNewOutputDevice(mOutputs.valueFor(curOutput), false /*fromCache*/);
-                        bool force = desc->device() != dev;
+                        bool force = prevDevice != dev;
                         uint32_t delayMs;
                         if (dev == prevDevice) {
                             delayMs = 0;