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

Commit 5db9adfd authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume... 

am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo

Merge commit '834f0483' into kraken

* commit '834f0483':
  Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
parents 0476f7a0 834f0483

media/java/android/media/AudioService.java

+3 −0
Original line number Diff line number Diff line
@@ -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;

            }

        }