Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18a0a8da authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Call route selected/unselected callbacks" into sc-dev am: 9f333ab2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14957149

Change-Id: Id461267d6f5524081d7e09977abdec91a7469c11
parents dbf23b85 9f333ab2

media/java/android/media/MediaRouter.java

+13 −3
Original line number Diff line number Diff line
@@ -696,13 +696,17 @@ public class MediaRouter { 
            @Override

            public void onGlobalA2dpChanged(boolean a2dpOn) {

                mHandler.post(() -> {

                    if (mSelectedRoute == null) {

                    if (mSelectedRoute == null || mBluetoothA2dpRoute == null) {

                        return;

                    }

                    if (mSelectedRoute.isDefault() && a2dpOn) {

                        setSelectedRoute(mBluetoothA2dpRoute, /*explicit=*/ false);

                        dispatchRouteUnselected(ROUTE_TYPE_LIVE_AUDIO, mDefaultAudioVideo);

                        dispatchRouteSelected(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute);

                    } else if (mSelectedRoute.isBluetooth() && !a2dpOn) {

                        setSelectedRoute(mDefaultAudioVideo, /*explicit=*/ false);

                        dispatchRouteUnselected(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute);

                        dispatchRouteSelected(ROUTE_TYPE_LIVE_AUDIO, mDefaultAudioVideo);

                    }

                });

            }
@@ -1363,6 +1367,9 @@ 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);
@@ -1371,6 +1378,9 @@ 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);