diff options
| author | Eric Laurent <elaurent@google.com> | 2010-04-14 10:39:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-14 10:39:32 -0700 |
| commit | 745b43c28fd6bb82c72a15b28be75c55dd115171 (patch) | |
| tree | b507da750294d2952856b7e306db4950425a10d6 | |
| parent | 01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412 (diff) | |
| parent | 527c3ab51e258dfa15c6240f701693cf914e8e93 (diff) | |
| download | frameworks_base-745b43c28fd6bb82c72a15b28be75c55dd115171.zip frameworks_base-745b43c28fd6bb82c72a15b28be75c55dd115171.tar.gz frameworks_base-745b43c28fd6bb82c72a15b28be75c55dd115171.tar.bz2 | |
Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
| -rw-r--r-- | media/java/android/media/AudioService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 9ab02f0..3e38e53 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; } } |