commit 14a62045ac96146ebe5944d1913dbed55f6c0193
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 10 20:44:54 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 10 20:44:54 2021 +0000
tree f17a4337fb49a1d7d5bf2ab07a6c0f0b7334fd21
parent 8011bd5f49610a346a591f516135f438047e14d8
parent 7cf5ae1c79a79c5df02ceea37d4ed37cb17e63b6

Merge "AudioService: fix SCO audio resume after call" into sc-v2-dev

services/core/java/com/android/server/audio/AudioDeviceBroker.java

diff --git a/services/core/java/com/android/server/audio/AudioDeviceBroker.java b/services/core/java/com/android/server/audio/AudioDeviceBroker.java
index 5ecdfe4..f053e94 100644
--- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java
+++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java
@@ -328,7 +328,7 @@
         }
 
         boolean isBtScoRequested = isBluetoothScoRequested();
-        if (isBtScoRequested && !wasBtScoRequested) {
+        if (isBtScoRequested && (!wasBtScoRequested || !isBluetoothScoActive())) {
             if (!mBtHelper.startBluetoothSco(scoAudioMode, eventSource)) {
                 Log.w(TAG, "setCommunicationRouteForClient: failure to start BT SCO for pid: "
                         + pid);