am 6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0

* commit '6e91e5b689a3eb8e6a6f3c038322b8044a9d6670': Fix volume indication in vibrate mode.
2011-10-31 23:23:15 +00:00
parent b288f99334 6e91e5b689
commit cd84197ac1
1 changed files with 4 additions and 2 deletions
--- a/media/java/android/media/AudioService.java
+++ b/media/java/android/media/AudioService.java
@@ -1635,8 +1635,10 @@ public class AudioService extends IAudioService.Stub {
                    // "silent mode", but which one?
                    newRingerMode = vibeInSilent ? RINGER_MODE_VIBRATE : RINGER_MODE_SILENT;
                }
-                if (uiIndex == 0 || (mPrevVolDirection == AudioManager.ADJUST_LOWER &&
-                        mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {
+                if (uiIndex == 0 ||
+                        (!vibeInSilent &&
+                         mPrevVolDirection == AudioManager.ADJUST_LOWER &&
+                         mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {
                    adjustVolumeIndex = false;
                }
            }