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

Commit 929801a9 authored by Ajay Panicker's avatar Ajay Panicker
Browse files

Don't set Bluetooth volume when the Bluetooth stream changes 

Don't restore the remembered volume whenever an Bluetooth A2DP stream
comes up or whenever Bluetooth AVRCP reports absolute volume support.
All Bluetooth volume memory will now be handled by Bluetooth.

Bug: 30602783
Test: See that AudioService doesn't try to change the volume when a
Bluetooth device connects.

Change-Id: I683062c1a0565591ae33cbbb0381730b86ad17c2
(cherry picked from commit 085ecc32)
parent a8c840c4

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

+0 −8
Original line number Diff line number Diff line
@@ -5658,8 +5658,6 @@ public class AudioService extends IAudioService.Stub 
        // enable A2DP before notifying A2DP connection to avoid unnecessary processing in

        // audio policy manager

        VolumeStreamState streamState = mStreamStates[AudioSystem.STREAM_MUSIC];

        sendMsg(mAudioHandler, MSG_SET_DEVICE_VOLUME, SENDMSG_QUEUE,

                AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, 0, streamState, 0);

        setBluetoothA2dpOnInt(true, eventSource);

        AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                AudioSystem.DEVICE_STATE_AVAILABLE, address, name);
@@ -5927,12 +5925,6 @@ 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);

            sendMsg(mAudioHandler, MSG_SET_DEVICE_VOLUME, SENDMSG_QUEUE,

                    AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP, 0,

                    mStreamStates[AudioSystem.STREAM_RING], 0);

        }

    }