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

Commit 28a697b0 authored by Vlad Popa's avatar Vlad Popa Committed by Android (Google) Code Review
Browse files

Merge "Fix abs volume being enabled for a2dp without avrcp" into main

parents 8788db00 fda90375

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

+2 −2
Original line number Diff line number Diff line
@@ -9953,9 +9953,9 @@ public class AudioService extends IAudioService.Stub 
            int a2dpDev = AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP;

            synchronized (mCachedAbsVolDrivingStreamsLock) {

                mCachedAbsVolDrivingStreams.compute(a2dpDev, (dev, stream) -> {

                    if (stream != null && !mAvrcpAbsVolSupported) {

                    if (!mAvrcpAbsVolSupported) {

                        mAudioSystem.setDeviceAbsoluteVolumeEnabled(a2dpDev, /*address=*/

                                "", /*enabled*/false, AudioSystem.DEVICE_NONE);

                                "", /*enabled*/false, AudioSystem.STREAM_DEFAULT);

                        return null;

                    }

                    // For A2DP and AVRCP we need to set the driving stream based on the