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

Commit 1b905716 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am 3e846cb5: am 313ec49f: am ce66d35f: Merge "Volume: Don\'t allow ringer... 

am 3e846cb5: am 313ec49f: am ce66d35f: Merge "Volume: Don\'t allow ringer volume of 0 exiting ringer mode." into lmp-mr1-dev

* commit '3e846cb5':
  Volume: Don't allow ringer volume of 0 exiting ringer mode.
parents d5408ad4 3e846cb5

media/java/android/media/AudioService.java

+2 −2
Original line number Diff line number Diff line
@@ -1827,8 +1827,8 @@ public class AudioService extends IAudioService.Stub { 
                if (!isStreamAffectedByRingerMode(streamType) ||

                    ringerMode == AudioManager.RINGER_MODE_NORMAL) {

                    // ring and notifications volume should never be 0 when not silenced

                    // on voice capable devices

                    if (isPlatformVoice() &&

                    // on voice capable devices or devices that support vibration

                    if ((isPlatformVoice() || mHasVibrator) &&

                            mStreamVolumeAlias[streamType] == AudioSystem.STREAM_RING) {

                        synchronized (VolumeStreamState.class) {

                            Set set = mStreamStates[streamType].mIndex.entrySet();