diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2021-09-07 17:59:28 +0900 |
|---|---|---|
| committer | Sungsoo Lim <sungsoo@google.com> | 2021-09-23 15:31:20 +0900 |
| commit | ef07a1a45ada8d8f2818d130da374579ddacb611 (patch) | |
| tree | c99dc74876a5556b0ed551c6fe28263098a5d32c | |
| parent | f3d3be52605ce90afdde5dd0746db1aa0188ab42 (diff) | |
DO NOT MERGE: Revert "Call route selected/unselected callbacks"
This reverts commit 6adeb2c9f140d6cacd28d8eaf188370794494189.
Bug: 193831720, Bug: 168093983
Test: manual
Change-Id: I0c0c3ac9ed63bafe419c8a127772d4042abbab89
(cherry picked from commit 89d28318a038de80a32e9337e2f7f7d196b7665a)
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java index 345d9b27c8a8..1a2a1aee0eb3 100644 --- a/media/java/android/media/MediaRouter.java +++ b/media/java/android/media/MediaRouter.java @@ -696,17 +696,13 @@ public class MediaRouter { @Override public void onGlobalA2dpChanged(boolean a2dpOn) { mHandler.post(() -> { - if (mSelectedRoute == null || mBluetoothA2dpRoute == null) { + if (mSelectedRoute == null) { return; } if (mSelectedRoute.isDefault() && a2dpOn) { - setSelectedRoute(mBluetoothA2dpRoute, /*explicit=*/ false); - dispatchRouteUnselected(ROUTE_TYPE_LIVE_AUDIO, mDefaultAudioVideo); - dispatchRouteSelected(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute); + setSelectedRoute(mBluetoothA2dpRoute, /*explicit=*/false); } else if (mSelectedRoute.isBluetooth() && !a2dpOn) { - setSelectedRoute(mDefaultAudioVideo, /*explicit=*/ false); - dispatchRouteUnselected(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute); - dispatchRouteSelected(ROUTE_TYPE_LIVE_AUDIO, mDefaultAudioVideo); + setSelectedRoute(mDefaultAudioVideo, /*explicit=*/false); } }); } @@ -1367,9 +1363,6 @@ public class MediaRouter { } static void dispatchRouteSelected(int type, RouteInfo info) { - if (DEBUG) { - Log.d(TAG, "Dispatching route selected: " + info); - } for (CallbackInfo cbi : sStatic.mCallbacks) { if (cbi.filterRouteEvent(info)) { cbi.cb.onRouteSelected(cbi.router, type, info); @@ -1378,9 +1371,6 @@ public class MediaRouter { } static void dispatchRouteUnselected(int type, RouteInfo info) { - if (DEBUG) { - Log.d(TAG, "Dispatching route unselected: " + info); - } for (CallbackInfo cbi : sStatic.mCallbacks) { if (cbi.filterRouteEvent(info)) { cbi.cb.onRouteUnselected(cbi.router, type, info); |