diff options
| author | Eric Laurent <elaurent@google.com> | 2010-04-14 12:11:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-14 12:11:24 -0700 |
| commit | 5db9adfd405f940b325bbc88d8f6ec4b25bd9a80 (patch) | |
| tree | 818cc7eec2d3ea3ebd0c3a08439629c1646880df /media | |
| parent | 0476f7a063f8969730b2752c989fabe6e04d2d4b (diff) | |
| parent | 834f0483ee7259f19e3f5d8e5c09ddcf875535b1 (diff) | |
| download | frameworks_base-5db9adfd405f940b325bbc88d8f6ec4b25bd9a80.zip frameworks_base-5db9adfd405f940b325bbc88d8f6ec4b25bd9a80.tar.gz frameworks_base-5db9adfd405f940b325bbc88d8f6ec4b25bd9a80.tar.bz2 | |
am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
Merge commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken
* commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1':
Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
Diffstat (limited to 'media')
| -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; } } |