commit 3e7eb5eb24e6bf9a31495dee5e5f8252728a2b7d
author Yung Ti Su <andysu@google.com> Wed Jun 13 11:48:42 2018 +0800
committer Yung Ti Su <andysu@google.com> Fri Jun 22 07:13:21 2018 +0000
tree c94d954e4295d662b78db83f37f06c46b42f5865
parent c22b754fa944017c5d4c5ca58a077fdf89842947

audiopolicy: fix for ringtone and offload music playback concurrency

Root cause: music output is still active when setphonestate and will be
reevaluate routing and change back to normal speaker.

follow the change of https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/av/+/4292147

Bug: 110072502
Test: self-tested over 30 times.

Change-Id: Iec1c85f9cd24e3eae149fa27ad8d1ec2b23019e0
Signed-off-by: Yung Ti Su <andysu@google.com>

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 7154cb2..958ac30 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -4842,7 +4842,7 @@
     } else if (isInCall() ||
                isStrategyActiveOnSameModule(outputDesc, STRATEGY_PHONE)) {
         device = getDeviceForStrategy(STRATEGY_PHONE, fromCache);
-    } else if (isStrategyActive(outputDesc, STRATEGY_SONIFICATION)) {
+    } else if (isStrategyActiveOnSameModule(outputDesc, STRATEGY_SONIFICATION)) {
         device = getDeviceForStrategy(STRATEGY_SONIFICATION, fromCache);
     } else if (isStrategyActive(outputDesc, STRATEGY_ENFORCED_AUDIBLE)) {
         device = getDeviceForStrategy(STRATEGY_ENFORCED_AUDIBLE, fromCache);