diff options
| author | Eric Laurent <elaurent@google.com> | 2012-05-01 10:47:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-01 10:47:57 -0700 |
| commit | 94affdd80e20c334dd5bfff170aee878992195ad (patch) | |
| tree | 2aa8d822e7606e10b2166e88e996986e2579dd7e /media | |
| parent | 59eaa907fef9454f6f5ff2ab727eef43bdf7f88d (diff) | |
| parent | f740664cd808bebfc35ded46da6002bdc97a1a16 (diff) | |
| download | frameworks_base-94affdd80e20c334dd5bfff170aee878992195ad.zip frameworks_base-94affdd80e20c334dd5bfff170aee878992195ad.tar.gz frameworks_base-94affdd80e20c334dd5bfff170aee878992195ad.tar.bz2 | |
Merge "fix unmute from volume panel on tablets" into jb-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index c0b17d9..542d2df 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -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 |