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

Commit 8ca9a1cf authored by Eric Laurent's avatar Eric Laurent
Browse files

Fix volume indication in vibrate mode. 

The latest change in silent/vibrate mode selection via volume keys
was such that ringtone volume was not showing 0 when entering vibrate mode
by continuous press on vol down.

Issue 5530217.

Change-Id: I9ba817648e5dca40e0d19f5f606d7763ae61b1c6
parent 69e640ee

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;

                }