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

Commit 94affdd8 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "fix unmute from volume panel on tablets" into jb-dev

parents 59eaa907 f740664c

media/java/android/media/AudioService.java

+3 −3
Original line number Diff line number Diff line
@@ -706,9 +706,9 @@ public class AudioService extends IAudioService.Stub implements OnFinished { 
        final int oldIndex = streamState.getIndex(device,

                                                  (streamState.muteCount() != 0) /* lastAudible */);



        // setting ring or notifications volume to 0 on voice capable devices enters silent mode

        if (mVoiceCapable && (((flags & AudioManager.FLAG_ALLOW_RINGER_MODES) != 0) ||

                (mStreamVolumeAlias[streamType] == AudioSystem.STREAM_RING))) {

        // setting volume on master stream type also controls silent mode

        if (((flags & AudioManager.FLAG_ALLOW_RINGER_MODES) != 0) ||

                (mStreamVolumeAlias[streamType] == getMasterStreamType())) {

            int newRingerMode;

            if (index == 0) {

                newRingerMode = System.getInt(mContentResolver, System.VIBRATE_IN_SILENT, 1) == 1