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

Commit 3ee7b6ca authored by Eric Laurent's avatar Eric Laurent Committed by Ajay Panicker
Browse files

Add field to set A2DP device volume on connect (1/2) 

Add a field to setBluetoothA2dpDeviceConnectionStateInt() to allow
Bluetooth to set a volume for the new device when it connects.

Bug: 79529581
Test: Switch repeatedly between devices and see that the old volume isn't
used on the new device or the new volume isn't used on the old device.
Change-Id: Iea13ca8b5c538c999149baba6e9069745ad9466b
Merged-In: I909fa3f40818c595fc977695fbfa1214f9a4de72

(cherry picked from commit 3e6fb630)
parent 5a6df1af

media/java/android/media/AudioManager.java

+4 −2
Original line number Diff line number Diff line
@@ -3664,6 +3664,7 @@ public class AudioManager { 
     * @param device Bluetooth device connected/disconnected

     * @param state  new connection state (BluetoothProfile.STATE_xxx)

     * @param profile profile for the A2DP device

     * @param a2dpVolume New volume for the connecting device. Does nothing if disconnecting.

     * (either {@link android.bluetooth.BluetoothProfile.A2DP} or

     * {@link android.bluetooth.BluetoothProfile.A2DP_SINK})

     * @param suppressNoisyIntent if true the
@@ -3673,12 +3674,13 @@ public class AudioManager { 
     * {@hide}

     */

    public int setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(

                BluetoothDevice device, int state, int profile, boolean suppressNoisyIntent) {

                BluetoothDevice device, int state, int profile,

                boolean suppressNoisyIntent, int a2dpVolume) {

        final IAudioService service = getService();

        int delay = 0;

        try {

            delay = service.setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(device,

                state, profile, suppressNoisyIntent);

                state, profile, suppressNoisyIntent, a2dpVolume);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

media/java/android/media/IAudioService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ interface IAudioService { 
    oneway void playerHasOpPlayAudio(in int piid, in boolean hasOpPlayAudio);



    int setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(in BluetoothDevice device,

            int state, int profile, boolean suppressNoisyIntent);

            int state, int profile, boolean suppressNoisyIntent, int a2dpVolume);



    // WARNING: read warning at top of file, it is recommended to add new methods at the end

}

services/core/java/com/android/server/audio/AudioService.java

+49 −38
Original line number Diff line number Diff line
@@ -3476,7 +3476,7 @@ public class AudioService extends IAudioService.Stub 
                            queueMsgUnderWakeLock(mAudioHandler,

                                    MSG_SET_A2DP_SINK_CONNECTION_STATE,

                                    state,

                                    0 /* arg2 unused */,

                                    -1,

                                    btDevice,

                                    delay);

                        }
@@ -4162,22 +4162,22 @@ public class AudioService extends IAudioService.Stub 
    public int setBluetoothA2dpDeviceConnectionState(BluetoothDevice device, int state, int profile)

    {

        return setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(

                device, state, profile, false /* suppressNoisyIntent */);

                device, state, profile, false /* suppressNoisyIntent */, -1 /* a2dpVolume */);

    }



    public int setBluetoothA2dpDeviceConnectionStateSuppressNoisyIntent(BluetoothDevice device,

                int state, int profile, boolean suppressNoisyIntent)

                int state, int profile, boolean suppressNoisyIntent, int a2dpVolume)

    {

        if (mAudioHandler.hasMessages(MSG_SET_A2DP_SINK_CONNECTION_STATE, device)) {

            return 0;

        }

        return setBluetoothA2dpDeviceConnectionStateInt(

                device, state, profile, suppressNoisyIntent, AudioSystem.DEVICE_NONE);

                device, state, profile, suppressNoisyIntent, AudioSystem.DEVICE_NONE, a2dpVolume);

    }



    public int setBluetoothA2dpDeviceConnectionStateInt(

            BluetoothDevice device, int state, int profile, boolean suppressNoisyIntent,

            int musicDevice)

            int musicDevice, int a2dpVolume)

    {

        int delay;

        if (profile != BluetoothProfile.A2DP && profile != BluetoothProfile.A2DP_SINK) {
@@ -4195,7 +4195,7 @@ public class AudioService extends IAudioService.Stub 
                    (profile == BluetoothProfile.A2DP ?

                        MSG_SET_A2DP_SINK_CONNECTION_STATE : MSG_SET_A2DP_SRC_CONNECTION_STATE),

                    state,

                    0 /* arg2 unused */,

                    a2dpVolume,

                    device,

                    delay);

        }
@@ -4693,9 +4693,6 @@ public class AudioService extends IAudioService.Stub 
        }

    }



    /** Handles internal volume messages in separate volume thread. */

    private class AudioHandler extends Handler {



    private void setDeviceVolume(VolumeStreamState streamState, int device) {



        synchronized (VolumeStreamState.class) {
@@ -4729,6 +4726,9 @@ public class AudioService extends IAudioService.Stub 


    }



    /** Handles internal volume messages in separate volume thread. */

    private class AudioHandler extends Handler {



        private void setAllVolumes(VolumeStreamState streamState) {



            // Apply volume
@@ -5074,7 +5074,7 @@ public class AudioService extends IAudioService.Stub 
                    break;



                case MSG_SET_A2DP_SINK_CONNECTION_STATE:

                    onSetA2dpSinkConnectionState((BluetoothDevice)msg.obj, msg.arg1);

                    onSetA2dpSinkConnectionState((BluetoothDevice)msg.obj, msg.arg1, msg.arg2);

                    mAudioEventWakeLock.release();

                    break;
@@ -5312,7 +5312,7 @@ public class AudioService extends IAudioService.Stub 
        return mAudioHandler.hasMessages(MSG_BTA2DP_DOCK_TIMEOUT);

    }



    private void onSetA2dpSinkConnectionState(BluetoothDevice btDevice, int state)

    private void onSetA2dpSinkConnectionState(BluetoothDevice btDevice, int state, int a2dpVolume)

    {

        if (DEBUG_DEVICES) {

            Log.d(TAG, "onSetA2dpSinkConnectionState btDevice=" + btDevice+"state=" + state);
@@ -5363,6 +5363,14 @@ public class AudioService extends IAudioService.Stub 
                        makeA2dpDeviceUnavailableNow(mDockAddress);

                    }

                }

                if (a2dpVolume != -1) {

                    VolumeStreamState streamState = mStreamStates[AudioSystem.STREAM_MUSIC];

                    // Convert index to internal representation in VolumeStreamState

                    a2dpVolume = a2dpVolume * 10;

                    streamState.setIndex(a2dpVolume, AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                            "onSetA2dpSinkConnectionState");

                    setDeviceVolume(streamState, AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP);

                }

                makeA2dpDeviceAvailable(address, btDevice.getName(),

                        "onSetA2dpSinkConnectionState");

                synchronized (mCurAudioRoutes) {
@@ -5432,7 +5440,7 @@ public class AudioService extends IAudioService.Stub 
                   // consistent with audio policy manager state

                   setBluetoothA2dpDeviceConnectionStateInt(

                           btDevice, BluetoothA2dp.STATE_DISCONNECTED, BluetoothProfile.A2DP,

                           false /* suppressNoisyIntent */, musicDevice);

                           false /* suppressNoisyIntent */, musicDevice, -1 /* a2dpVolume */);

               }

            }

        }
@@ -5442,6 +5450,9 @@ public class AudioService extends IAudioService.Stub 
        // address is not used for now, but may be used when multiple a2dp devices are supported

        synchronized (mA2dpAvrcpLock) {

            mAvrcpAbsVolSupported = support;

            sendMsg(mAudioHandler, MSG_SET_DEVICE_VOLUME, SENDMSG_QUEUE,

                    AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, 0,

                    mStreamStates[AudioSystem.STREAM_MUSIC], 0);

        }

    }