commit 11c499a59eb8effc59209f6c06df3ed78c2998a8
author Haynes Mathew George <hgeorge@codeaurora.org> Fri Aug 26 12:08:25 2016 -0700
committer Glenn Kasten <gkasten@google.com> Tue Aug 30 13:27:24 2016 -0700
tree dca4ba5b10684ee27f161eefb1915822cdcb338a
parent 8e7b58c0aeb6d106d9f83ff0048c30849f12df82

audiopolicy: Avoid spurious routing in APM::stopSource

On AudioOutput::stopSource, ignore routing calls
on an output descriptor to the same device

Bug: 31185954
Change-Id: I80f442982f7e66efb59b639a7ca9424745dbd70a

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index b752541..1ddfb4d 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1321,9 +1321,11 @@
                         desc->isActive() &&
                         outputDesc->sharesHwModuleWith(desc) &&
                         (newDevice != desc->device())) {
+                    audio_devices_t newDevice2 = getNewOutputDevice(desc, false /*fromCache*/);
+                    bool force = desc->device() != newDevice2;
                     setOutputDevice(desc,
-                                    getNewOutputDevice(desc, false /*fromCache*/),
-                                    true,
+                                    newDevice2,
+                                    force,
                                     outputDesc->latency()*2);
                 }
             }