am 5db9adfd: am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo

2010-04-15 06:38:39 -07:00
parent 7a8a91d1b0 5db9adfd40
commit 491f250583
1 changed files with 3 additions and 0 deletions
--- 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;
            }
        }