From 75702566e413c5822dbf85071142ceba473d29ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Gaffie?= Date: Wed, 11 Mar 2020 14:09:52 +0100 Subject: [PATCH] Fix regression on voice call default volume MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL fixes regression introduced by aosp/586122. The fallback of default volume uses a temporary max volume which may not be valid. (-1). This CL uses the up to date AudioSystem.DEFAULT_STREAM_VOLUME instead. This happens only if no "ro.config.vc_call_vol_default" property defined. Bug: 152079599 Test: Ensure "ro.config.vc_call_vol_default" is not defined && dumpsys audio && ensure VOICE CALL default volume (aka for device 40000000) is not zero. Signed-off-by: François Gaffie Change-Id: I8937e54a61df196da8c2578f0a581b63dea34caa Merged-In: I8937e54a61df196da8c2578f0a581b63dea34caa --- services/core/java/com/android/server/audio/AudioService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index f3d42ad1c7931..1f0146ad815d5 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -693,7 +693,7 @@ public class AudioService extends IAudioService.Stub AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] = defaultCallVolume; } else { AudioSystem.DEFAULT_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] = - (maxCallVolume * 3) / 4; + (MAX_STREAM_VOLUME[AudioSystem.STREAM_VOICE_CALL] * 3) / 4; } int maxMusicVolume = SystemProperties.getInt("ro.config.media_vol_steps", -1);