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

Commit 4bb7fb53 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I86df6f9f,I0c0c3ac9 

* changes:
  Revert "Reset app routes when global a2dp state changed"
  Revert "Call route selected/unselected callbacks"
parents 768e2313 6d4a00b1

media/java/android/media/IMediaRouterClient.aidl

+0 −1
Original line number Diff line number Diff line
@@ -23,5 +23,4 @@ oneway interface IMediaRouterClient { 
    void onStateChanged();

    void onRestoreRoute();

    void onGroupRouteSelected(String routeId);

    void onGlobalA2dpChanged(boolean a2dpOn);

}

media/java/android/media/MediaRouter.java

+6 −29
Original line number Diff line number Diff line
@@ -654,10 +654,13 @@ public class MediaRouter { 
        final class Client extends IMediaRouterClient.Stub {

            @Override

            public void onStateChanged() {

                mHandler.post(() -> {

                mHandler.post(new Runnable() {

                    @Override

                    public void run() {

                        if (Client.this == mClient) {

                            updateClientState();

                        }

                    }

                });

            }
@@ -690,26 +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 || 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);

                    }

                });

            }

        }

    }
@@ -1367,9 +1350,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 +1358,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);

services/core/java/com/android/server/media/MediaRouterService.java

+0 −18
Original line number Diff line number Diff line
@@ -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

                                    }

                                }

                            }

                        }

                    }

                }

            }

        }