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

Commit e926dedf authored by Norman Bintang's avatar Norman Bintang
Browse files

audio: Add volume alias for PC with single volume 

This volume alias is used to separate a11y volume from the media volume
when config_single_volume is on.

Bug: 376307941
Test: Enable talkback, make sure there is a separate a11y volume slider
in the volume dialog
Flag: EXEMPT desktop only

Change-Id: Ie2da23cbbd415e395760f86f8f1f553c80985100
parent e589c9c8

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

+23 −4
Original line number Diff line number Diff line
@@ -659,8 +659,9 @@ public class AudioService extends IAudioService.Stub 
     * Some streams alias to different streams according to device category (phone or tablet) or

     * use case (in call vs off call...). See updateStreamVolumeAlias() for more details.

     *  sStreamVolumeAlias contains STREAM_VOLUME_ALIAS_VOICE aliases for a voice capable device

     *  (phone), STREAM_VOLUME_ALIAS_TELEVISION for a television or set-top box and

     *  STREAM_VOLUME_ALIAS_DEFAULT for other devices (e.g. tablets).*/

     *  (phone), STREAM_VOLUME_ALIAS_TELEVISION for a television or set-top box,

     *  STREAM_VOLUME_ALIAS_PC_SINGLE_VOLUME for a desktop/laptop that enables config_single_volume

     *  and STREAM_VOLUME_ALIAS_DEFAULT for other devices (e.g. tablets).*/

    private final int[] STREAM_VOLUME_ALIAS_VOICE = new int[] {

        AudioSystem.STREAM_VOICE_CALL,      // STREAM_VOICE_CALL

        AudioSystem.STREAM_RING,            // STREAM_SYSTEM
@@ -689,6 +690,20 @@ public class AudioService extends IAudioService.Stub 
        AudioSystem.STREAM_MUSIC,       // STREAM_ACCESSIBILITY

        AudioSystem.STREAM_MUSIC        // STREAM_ASSISTANT

    };

    private final int[] STREAM_VOLUME_ALIAS_PC_SINGLE_VOLUME = new int[] {

        AudioSystem.STREAM_MUSIC,           // STREAM_VOICE_CALL

        AudioSystem.STREAM_MUSIC,           // STREAM_SYSTEM

        AudioSystem.STREAM_MUSIC,           // STREAM_RING

        AudioSystem.STREAM_MUSIC,           // STREAM_MUSIC

        AudioSystem.STREAM_MUSIC,           // STREAM_ALARM

        AudioSystem.STREAM_MUSIC,           // STREAM_NOTIFICATION

        AudioSystem.STREAM_BLUETOOTH_SCO,   // STREAM_BLUETOOTH_SCO

        AudioSystem.STREAM_MUSIC,           // STREAM_SYSTEM_ENFORCED

        AudioSystem.STREAM_MUSIC,           // STREAM_DTMF

        AudioSystem.STREAM_MUSIC,           // STREAM_TTS

        AudioSystem.STREAM_ACCESSIBILITY,   // STREAM_ACCESSIBILITY

        AudioSystem.STREAM_MUSIC            // STREAM_ASSISTANT

    };

    /**

     * Using Volume groups configuration allows to control volume per attributes

     * and group definition may differ from stream aliases.
@@ -2864,7 +2879,11 @@ public class AudioService extends IAudioService.Stub 
                AudioSystem.STREAM_ASSISTANT : AudioSystem.STREAM_MUSIC;















        if (mIsSingleVolume) {













            if (isPlatformPc()) {













                initStreamVolumeAlias(STREAM_VOLUME_ALIAS_PC_SINGLE_VOLUME);













            } else {















                initStreamVolumeAlias(STREAM_VOLUME_ALIAS_TELEVISION);













            }















            dtmfStreamAlias = AudioSystem.STREAM_MUSIC;















        } else if (mUseVolumeGroupAliases) {















            initStreamVolumeAlias(STREAM_VOLUME_ALIAS_NONE);










@@ -13014,7 +13033,7 @@ public class AudioService extends IAudioService.Stub



























    private void updateA11yVolumeAlias(boolean a11VolEnabled) {















        if (DEBUG_VOL) Log.d(TAG, "Accessibility volume enabled = " + a11VolEnabled);













        if (mIsSingleVolume) {













        if (mIsSingleVolume && !isPlatformPc()) {















            if (DEBUG_VOL) Log.d(TAG, "Accessibility volume is not set on single volume device");















            return;















        }