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

Commit 7cf442a6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30495811'] into 25Q1-release. 

Change-Id: Ib6cbaac9d49acaa1bff5309aabd0b9d6eefd85e0
parents fb6fbe1a 03f104de

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

+9 −0
Original line number Diff line number Diff line
@@ -4954,6 +4954,15 @@ public class AudioService extends IAudioService.Stub 
        }















        final Set<Integer> deviceTypes = getDeviceSetForStreamDirect(streamType);

























        final Set<Integer> a2dpDevices = AudioSystem.intersectionAudioDeviceTypes(













                AudioSystem.DEVICE_OUT_ALL_A2DP_SET, deviceTypes);













        if (!a2dpDevices.isEmpty()) {













            int index = getStreamVolume(streamType,













                    a2dpDevices.toArray(new Integer[0])[0].intValue());













            mDeviceBroker.postSetAvrcpAbsoluteVolumeIndex(index);













        }



























        final Set<Integer> absVolumeMultiModeCaseDevices =















                AudioSystem.intersectionAudioDeviceTypes(















                        mAbsVolumeMultiModeCaseDevices, deviceTypes);