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

Merge commit '745b43c28fd6bb82c72a15b28be75c55dd115171' into froyo-plus-aosp

* commit '745b43c28fd6bb82c72a15b28be75c55dd115171':
  Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
This commit is contained in:
Eric Laurent
2010-04-14 12:04:16 -07:00
committed by Android Git Automerger

View File

@@ -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;
}
}