Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19774dda authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

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

* commit 'cd84197a':
  Fix volume indication in vibrate mode.
parents 57911703 cd84197a

media/java/android/media/AudioService.java

+4 −2
Original line number Diff line number Diff line
@@ -1635,7 +1635,9 @@ 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 &&

                if (uiIndex == 0 ||

                        (!vibeInSilent &&

                         mPrevVolDirection == AudioManager.ADJUST_LOWER &&

                         mVoiceCapable && streamType == AudioSystem.STREAM_RING)) {

                    adjustVolumeIndex = false;

                }