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

Commit 2e27496b authored by Shuhei Miyazaki's avatar Shuhei Miyazaki Committed by android-build-merger
Browse files

Merge "audioservice: Add a property for default voice call volume" 

am: 9d9782ec

Change-Id: I1830205ecc1a7e7198be1f01095b9043a95af79f
parents eb358dad 9d9782ec

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

+10 −1
Original line number Diff line number Diff line
@@ -684,6 +684,14 @@ public class AudioService extends IAudioService.Stub 
        int maxCallVolume = SystemProperties.getInt("ro.config.vc_call_vol_steps", -1);

        if (maxCallVolume != -1) {

            MAX_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] = maxCallVolume;

        }



        int defaultCallVolume = SystemProperties.getInt("ro.config.vc_call_vol_default", -1);

        if (defaultCallVolume != -1 &&

                defaultCallVolume <= MAX_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] &&

                defaultCallVolume >= MIN_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL]) {

            AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] = defaultCallVolume;

        } else {

            AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] =

                    (maxCallVolume * 3) / 4;

        }
@@ -695,7 +703,8 @@ public class AudioService extends IAudioService.Stub 


        int defaultMusicVolume = SystemProperties.getInt("ro.config.media_vol_default", -1);

        if (defaultMusicVolume != -1 &&

                defaultMusicVolume <= MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC]) {

                defaultMusicVolume <= MAX_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] &&

                defaultMusicVolume >= MIN_STREAM_VOLUME[AudioSystem.STREAM_MUSIC]) {

            AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_MUSIC] = defaultMusicVolume;

        } else {

            if (isPlatformTelevision()) {