Merge "AudioService: stop SCO audio when communication route client dies" into sc-qpr1-dev

2021-08-19 07:44:31 +00:00
parent 45b16df600 c89895fd39
commit f369d1dd62
1 changed files with 4 additions and 5 deletions
--- a/services/core/java/com/android/server/audio/AudioDeviceBroker.java
+++ b/services/core/java/com/android/server/audio/AudioDeviceBroker.java
@@ -1719,11 +1719,10 @@ import java.util.concurrent.atomic.AtomicBoolean;
        if (client == null) {
            return;
        }
-        Log.w(TAG, "Speaker client died");
-        if (removeCommunicationRouteClient(client.getBinder(), false)
-                != null) {
-            onUpdateCommunicationRoute("onCommunicationRouteClientDied");
-        }
+        Log.w(TAG, "Communication client died");
+        setCommunicationRouteForClient(
+                client.getBinder(), client.getPid(), null, BtHelper.SCO_MODE_UNDEFINED,
+                "onCommunicationRouteClientDied");
    }

    /**