From 527c3ab51e258dfa15c6240f701693cf914e8e93 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Tue, 13 Apr 2010 08:31:02 -0700 Subject: [PATCH] Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode. The problem happens only if volume down key is pressed while already in silent or vibrate mode. In this case, AudioService accepts changing the last audible index for ringer volume from 1 to 0. When volume up is pressed, current ringer volume value is restored from 0 instead of 1. The fix consists in keeping last audible index at 1 once in silent of vibrate mode even is volume down key is pressed. Change-Id: Id08edd12ce985c22233124545eba2c3e4b8cdc8e --- media/java/android/media/AudioService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 9ab02f00b5d55..3e38e530216a1 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -1128,6 +1128,9 @@ public class AudioService extends IAudioService.Stub { if (direction == AudioManager.ADJUST_RAISE) { // exiting silent mode newRingerMode = AudioManager.RINGER_MODE_NORMAL; + } else { + // prevent last audible index to reach 0 + adjustVolumeIndex = false; } }