diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2021-09-08 11:00:00 +0900 |
|---|---|---|
| committer | Sungsoo Lim <sungsoo@google.com> | 2021-09-23 15:31:31 +0900 |
| commit | d0c29f1bf10d62d1e3bb8dfbc491749c04e276e6 (patch) | |
| tree | cd7403ce0f1ed275be64f860fc72f945cce92a08 /media/java | |
| parent | ef07a1a45ada8d8f2818d130da374579ddacb611 (diff) | |
DO NOT MERGE: Revert "Reset app routes when global a2dp state changed"
This reverts commit 07e40316f8641c8579181bfe3bd918e7636dee70.
Bug: 193831720, Bug: 168093983, Bug: 156549746
Test: manual
Change-Id: I86df6f9f1d672c455cd0aedc58012b3335659479
(cherry picked from commit 6d4a00b17a89e073b01f98d7149ca9da4d6e09b6)
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/IMediaRouterClient.aidl | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 25 |
2 files changed, 6 insertions, 20 deletions
diff --git a/media/java/android/media/IMediaRouterClient.aidl b/media/java/android/media/IMediaRouterClient.aidl index 6b754e157cfb..9b4912373122 100644 --- a/media/java/android/media/IMediaRouterClient.aidl +++ b/media/java/android/media/IMediaRouterClient.aidl @@ -23,5 +23,4 @@ oneway interface IMediaRouterClient { void onStateChanged(); void onRestoreRoute(); void onGroupRouteSelected(String routeId); - void onGlobalA2dpChanged(boolean a2dpOn); } diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 1a2a1aee0eb3..2986f7c75f4d 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -654,9 +654,12 @@ public class MediaRouter { final class Client extends IMediaRouterClient.Stub { @Override public void onStateChanged() { - mHandler.post(() -> { - if (Client.this == mClient) { - updateClientState(); + mHandler.post(new Runnable() { + @Override + public void run() { + if (Client.this == mClient) { + updateClientState(); + } } }); } @@ -690,22 +693,6 @@ public class MediaRouter { } }); } - - // Called when the selection of a connected device (phone speaker or BT devices) - // is changed. - @Override - public void onGlobalA2dpChanged(boolean a2dpOn) { - mHandler.post(() -> { - if (mSelectedRoute == null) { - return; - } - if (mSelectedRoute.isDefault() && a2dpOn) { - setSelectedRoute(mBluetoothA2dpRoute, /*explicit=*/false); - } else if (mSelectedRoute.isBluetooth() && !a2dpOn) { - setSelectedRoute(mDefaultAudioVideo, /*explicit=*/false); - } - }); - } } } |