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

Commit dd0a1926 authored by Adam Powell's avatar Adam Powell
Browse files

MediaRouter bluetooth a2dp selection 

Remove bluetooth permission check from internal AudioService method
setBluetoothA2dpOn

Manage BT A2DP state in MediaRouter. A2DP is only enabled or disabled
when either the system built-in audio route or the A2DP audio route is
selected; when selecting any other route the current state is left
alone.

Change-Id: Ib14274e206e79bd8762edca1205ecfa87b7a94cf
parent eb2c1b21

media/java/android/media/AudioService.java

+0 −3
Original line number Diff line number Diff line
@@ -1660,9 +1660,6 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 


    /** @see AudioManager#setBluetoothA2dpOn() */

    public void setBluetoothA2dpOn(boolean on) {

        if (!checkAudioSettingsPermission("setBluetoothA2dpOn()")) {

            return;

        }

        setBluetoothA2dpOnInt(on);

    }

media/java/android/media/MediaRouter.java

+19 −3
Original line number Diff line number Diff line
@@ -81,9 +81,8 @@ public class MediaRouter { 
            IBinder b = ServiceManager.getService(Context.AUDIO_SERVICE);

            mAudioService = IAudioService.Stub.asInterface(b);



            // XXX this doesn't deal with locale changes!

            mSystemCategory = new RouteCategory(mResources.getText(

                    com.android.internal.R.string.default_audio_route_category_name),

            mSystemCategory = new RouteCategory(

                    com.android.internal.R.string.default_audio_route_category_name,

                    ROUTE_TYPE_LIVE_AUDIO, false);

        }
@@ -130,6 +129,13 @@ public class MediaRouter { 
                        info.mSupportedTypes = ROUTE_TYPE_LIVE_AUDIO;

                        sStatic.mBluetoothA2dpRoute = info;

                        addRoute(sStatic.mBluetoothA2dpRoute);

                        try {

                            if (mAudioService.isBluetoothA2dpOn()) {

                                selectRouteStatic(ROUTE_TYPE_LIVE_AUDIO, mBluetoothA2dpRoute);

                            }

                        } catch (RemoteException e) {

                            Log.e(TAG, "Error selecting Bluetooth A2DP route", e);

                        }

                    } else {

                        sStatic.mBluetoothA2dpRoute.mName = mCurRoutesInfo.mBluetoothName;

                        dispatchRouteChanged(sStatic.mBluetoothA2dpRoute);
@@ -279,6 +285,16 @@ public class MediaRouter { 
            return;

        }



        final RouteInfo btRoute = sStatic.mBluetoothA2dpRoute;

        if (btRoute != null && (types & ROUTE_TYPE_LIVE_AUDIO) != 0 &&

                (route == btRoute || route == sStatic.mDefaultAudio)) {

            try {

                sStatic.mAudioService.setBluetoothA2dpOn(route == btRoute);

            } catch (RemoteException e) {

                Log.e(TAG, "Error changing Bluetooth A2DP state", e);

            }

        }



        if (sStatic.mSelectedRoute != null) {

            // TODO filter types properly

            dispatchRouteUnselected(types & sStatic.mSelectedRoute.getSupportedTypes(),