commit 5fa0aed349268d0c6b5884cdc15f0ff026322879
author juyuchen <juyuchen@google.com> Wed May 16 10:58:37 2018 +0800
committer Juyu Chen <juyuchen@google.com> Thu May 17 10:13:05 2018 +0000
tree a889369dfba0d702e212f0fe584b6358540e9b70
parent 88af67ed2a068280c60bb467b58585fffa9f22a6

audio policy: choose bt-sco and speaker-safe path.

Choose speaker-safe-and-bt-sco path instead of speaker-and-bt-sco when
device is in ringtone mode.

Bug: 78257659
Test: manual audio test on B1/C1.

Signed-off-by: juyuchen <juyuchen@google.com>

services/audiopolicy/enginedefault/src/Engine.cpp

diff --git a/services/audiopolicy/enginedefault/src/Engine.cpp b/services/audiopolicy/enginedefault/src/Engine.cpp
index 23c020d..3e13e50 100644
--- a/services/audiopolicy/enginedefault/src/Engine.cpp
+++ b/services/audiopolicy/enginedefault/src/Engine.cpp
@@ -453,6 +453,12 @@
             }
             // Use both Bluetooth SCO and phone default output when ringing in normal mode
             if (mForceUse[AUDIO_POLICY_FORCE_FOR_COMMUNICATION] == AUDIO_POLICY_FORCE_BT_SCO) {
+                if ((strategy == STRATEGY_SONIFICATION) &&
+                        (device & AUDIO_DEVICE_OUT_SPEAKER) &&
+                        (availableOutputDevicesType & AUDIO_DEVICE_OUT_SPEAKER_SAFE)) {
+                    device |= AUDIO_DEVICE_OUT_SPEAKER_SAFE;
+                    device &= ~AUDIO_DEVICE_OUT_SPEAKER;
+                }
                 if (device2 != AUDIO_DEVICE_NONE) {
                     device |= device2;
                     break;