Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Laurent
2012-05-01 10:47:57 -07:00
committed by Android (Google) Code Review
parent 59eaa907fe f740664cd8
commit 94affdd80e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/AudioService.java
View File

@@ -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