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

Commit c80109db authored by Yan Han's avatar Yan Han
Browse files

Fix incorrect return value from getDeviceVolumeBehavior 

getDeviceVolumeBehavior may currently return an incorrect volume
behavior if the current behavior is not persisted in settings, and
setDeviceVolumeBehavior was called in the past.

With this change, getDeviceVolumeBehavior will always read the internal
state instead of settings to get the current volume behavior.

This affects a System API used by privileged apps, which may behave
incorrectly as a result.

Bug: 266566375
Test: atest AbsoluteVolumeBehaviorTest
Change-Id: I9fc3699741abe1123706ebf980cdf052566d4d31
parent dbeafc14

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

+0 −5
Original line number Diff line number Diff line
@@ -7234,11 +7234,6 @@ public class AudioService extends IAudioService.Stub 
        // AudioDeviceInfo.convertDeviceTypeToInternalDevice()

        final int audioSystemDeviceOut = device.getInternalType();













        int setDeviceVolumeBehavior = retrieveStoredDeviceVolumeBehavior(audioSystemDeviceOut);













        if (setDeviceVolumeBehavior != AudioManager.DEVICE_VOLUME_BEHAVIOR_UNSET) {













            return setDeviceVolumeBehavior;













        }



























        // setDeviceVolumeBehavior has not been explicitly called for the device type. Deduce the















        // current volume behavior.















        if (mFullVolumeDevices.contains(audioSystemDeviceOut)) {

































services/tests/servicestests/src/com/android/server/audio/AbsoluteVolumeBehaviorTest.java



+21
−0




























Original line number
Diff line number
Diff line








@@ -99,6 +99,27 @@ public class AbsoluteVolumeBehaviorTest {













                .isEqualTo(AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE);















    }





























    /**













     * Tests that getDeviceVolumeBehavior returns the correct volume behavior, even if













     * a different volume behavior was previously persisted via setDeviceVolumeBehavior













     */













    @Test













    public void registerDispatcherAfterSetDeviceVolumeBehavior_setsVolumeBehaviorToAbsolute() {













        List<VolumeInfo> volumes = Collections.singletonList(













                new VolumeInfo.Builder(AudioManager.STREAM_MUSIC).build());



























        mAudioService.setDeviceVolumeBehavior(DEVICE_SPEAKER_OUT,













                AudioManager.DEVICE_VOLUME_BEHAVIOR_FULL, mPackageName);













        mTestLooper.dispatchAll();



























        mAudioService.registerDeviceVolumeDispatcherForAbsoluteVolume(true,













                mMockDispatcher, mPackageName, DEVICE_SPEAKER_OUT, volumes, true);













        mTestLooper.dispatchAll();



























        assertThat(mAudioService.getDeviceVolumeBehavior(DEVICE_SPEAKER_OUT))













                .isEqualTo(AudioManager.DEVICE_VOLUME_BEHAVIOR_ABSOLUTE);













    }





























    @Test















    public void registerDispatcher_setsVolume() {















        List<VolumeInfo> volumes = Collections.singletonList(