From f740664cd808bebfc35ded46da6002bdc97a1a16 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Tue, 1 May 2012 10:03:38 -0700 Subject: [PATCH] fix unmute from volume panel on tablets Changing STREAM_MUSIC from volume panel on tablets should exit silent mode as does changing STREAM_RING on phones. Issue 5970208. Change-Id: Ia8ed62033da07a5d4dfcfa84b0b47b27414bdd9a --- media/java/android/media/AudioService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index dc9496fe22828..18178eff10468 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -711,9 +711,9 @@ public class AudioService extends IAudioService.Stub { final int oldIndex = streamState.getIndex(device, (streamState.muteCount() != 0) /* lastAudible */); - // setting ring or notifications volume to 0 on voice capable devices enters silent mode - if (mVoiceCapable && (((flags & AudioManager.FLAG_ALLOW_RINGER_MODES) != 0) || - (mStreamVolumeAlias[streamType] == AudioSystem.STREAM_RING))) { + // setting volume on master stream type also controls silent mode + if (((flags & AudioManager.FLAG_ALLOW_RINGER_MODES) != 0) || + (mStreamVolumeAlias[streamType] == getMasterStreamType())) { int newRingerMode; if (index == 0) { newRingerMode = System.getInt(mContentResolver, System.VIBRATE_IN_SILENT, 1) == 1