diff options
| -rw-r--r-- | media/java/android/media/IMediaRouterClient.aidl | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 25 | ||||
| -rw-r--r-- | services/core/java/com/android/server/media/MediaRouterService.java | 18 |
3 files changed, 6 insertions, 38 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); - } - }); - } } } diff --git a/services/core/java/com/android/server/media/MediaRouterService.java b/services/core/java/com/android/server/media/MediaRouterService.java index 9f02c3caa388..a57d7db0ec54 100644 --- a/services/core/java/com/android/server/media/MediaRouterService.java +++ b/services/core/java/com/android/server/media/MediaRouterService.java @@ -903,26 +903,8 @@ public final class MediaRouterService extends IMediaRouterService.Stub if (intent.getAction().equals(BluetoothA2dp.ACTION_ACTIVE_DEVICE_CHANGED)) { BluetoothDevice btDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE); synchronized (mLock) { - boolean wasA2dpOn = mGlobalBluetoothA2dpOn; mActiveBluetoothDevice = btDevice; mGlobalBluetoothA2dpOn = btDevice != null; - if (wasA2dpOn != mGlobalBluetoothA2dpOn) { - Slog.d(TAG, "GlobalBluetoothA2dpOn is changed to '" - + mGlobalBluetoothA2dpOn + "'"); - UserRecord userRecord = mUserRecords.get(mCurrentUserId); - if (userRecord != null) { - for (ClientRecord cr : userRecord.mClientRecords) { - // mSelectedRouteId will be null for BT and phone speaker. - if (cr.mSelectedRouteId == null) { - try { - cr.mClient.onGlobalA2dpChanged(mGlobalBluetoothA2dpOn); - } catch (RemoteException e) { - // Ignore exception - } - } - } - } - } } } } |