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

Commit 9a0bcbe5 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Don't set Bluetooth volume when the Bluetooth stream changes" into pi-dev am: 212eaf8e 

am: dc01e8e3

Change-Id: I3704782eb72152c792eb3467e32ff5ceeaa85fc5
parents 65253b51 dc01e8e3

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

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

        // enable A2DP before notifying A2DP connection to avoid unnecessary processing in

        // audio policy manager

        // audio policy manager

        VolumeStreamState streamState = mStreamStates[AudioSystem.STREAM_MUSIC];

        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);

        setBluetoothA2dpOnInt(true, eventSource);

        AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

        AudioSystem.setDeviceConnectionState(AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP,

                AudioSystem.DEVICE_STATE_AVAILABLE, address, name);

                AudioSystem.DEVICE_STATE_AVAILABLE, address, name);
@@ -5940,12 +5938,6 @@ public class AudioService extends IAudioService.Stub 
        // address is not used for now, but may be used when multiple a2dp devices are supported

        // address is not used for now, but may be used when multiple a2dp devices are supported

        synchronized (mA2dpAvrcpLock) {

        synchronized (mA2dpAvrcpLock) {

            mAvrcpAbsVolSupported = support;

            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);

        }

        }

    }

    }