Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Revert "Call route selected/unselected callbacks"" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-24 04:09:49 +00:00
committed by Android (Google) Code Review
parent f3e373903e ef07a1a45a
commit 2b5c371cbf
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media/java/android/media/MediaRouter.java
View File

@@ -696,17 +696,13 @@ public class MediaRouter {
@Override @Override
public void onGlobalA2dpChanged(boolean a2dpOn) { public void onGlobalA2dpChanged(boolean a2dpOn) {
mHandler.post(() -> { mHandler.post(() -> {
if (mSelectedRoute == null || mBluetoothA2dpRoute == null) { if (mSelectedRoute == null) {
return; return;
} }
if (mSelectedRoute.isDefault() && a2dpOn) { if (mSelectedRoute.isDefault() && a2dpOn) {
setSelectedRoute(mBluetoothA2dpRoute, /*explicit=*/false); setSelectedRoute(mBluetoothA2dpRoute, /*explicit=*/false);
dispatchRouteUnselected(ROUTE_TYPE_LIVE_AUDIO, mDefaultAudioVideo);
dispatchRouteSelected(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute);
} else if (mSelectedRoute.isBluetooth() && !a2dpOn) { } else if (mSelectedRoute.isBluetooth() && !a2dpOn) {
setSelectedRoute(mDefaultAudioVideo, /*explicit=*/false); setSelectedRoute(mDefaultAudioVideo, /*explicit=*/false);
dispatchRouteUnselected(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute);
dispatchRouteSelected(ROUTE_TYPE_LIVE_AUDIO, mDefaultAudioVideo);
} }
}); });
} }
@@ -1367,9 +1363,6 @@ public class MediaRouter {
} }
static void dispatchRouteSelected(int type, RouteInfo info) { static void dispatchRouteSelected(int type, RouteInfo info) {
if (DEBUG) {
Log.d(TAG, "Dispatching route selected: " + info);
}
for (CallbackInfo cbi : sStatic.mCallbacks) { for (CallbackInfo cbi : sStatic.mCallbacks) {
if (cbi.filterRouteEvent(info)) { if (cbi.filterRouteEvent(info)) {
cbi.cb.onRouteSelected(cbi.router, type, info); cbi.cb.onRouteSelected(cbi.router, type, info);
@@ -1378,9 +1371,6 @@ public class MediaRouter {
} }
static void dispatchRouteUnselected(int type, RouteInfo info) { static void dispatchRouteUnselected(int type, RouteInfo info) {
if (DEBUG) {
Log.d(TAG, "Dispatching route unselected: " + info);
}
for (CallbackInfo cbi : sStatic.mCallbacks) { for (CallbackInfo cbi : sStatic.mCallbacks) {
if (cbi.filterRouteEvent(info)) { if (cbi.filterRouteEvent(info)) {
cbi.cb.onRouteUnselected(cbi.router, type, info); cbi.cb.onRouteUnselected(cbi.router, type, info);