commit 6d7e24029e7a364fc0d41f2c2ebc5be6fb21f4a7
author qctecmdr <qctecmdr@localhost> Thu Jul 02 08:05:37 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 02 08:05:37 2020 -0700
tree 2509fea167c7fed3de1511187a57ddd1851a6130
parent 795c07e07c726ff7fb4a67c4e9c1cd75e5c54125
parent 1f032aac055f24f7af97c9fc935fd3b7a8fc6940

Merge "policy_hal: revert the logic for setting force flag"

policy_hal/AudioPolicyManager.cpp

diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index be678bc..45317e1 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1095,7 +1095,7 @@
                         outputDesc->sharesHwModuleWith(desc) &&
                         (newDevices != desc->devices())) {
                         DeviceVector dev = getNewOutputDevices(mOutputs.valueFor(curOutput), false /*fromCache*/);
-                        bool force = prevDevices != dev;
+                        bool force = desc->devices() != dev;
                         uint32_t delayMs;
                         if (dev == prevDevices) {
                             delayMs = 0;