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

Use the unresolved stream type for mute checking.

Browse Source 
Change-Id: I2eab68727f1d1e6846ad0536ee456daf26f6699e
This commit is contained in:
John Spurlock
2015-02-17 13:20:45 -05:00
parent b1193ade25
commit 3ce3725b28
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -370,7 +370,8 @@ public class AudioService extends IAudioService.Stub {
// Streams currently muted by ringer mode
private int mRingerModeMutedStreams;
/** @see System#MUTE_STREAMS_AFFECTED */
/** Streams that can be muted. Do not resolve to aliases when checking.
* @see System#MUTE_STREAMS_AFFECTED */
private int mMuteAffectedStreams;
/**
@@ -998,15 +999,15 @@ public class AudioService extends IAudioService.Stub {
boolean isMuteAdjust = isMuteAdjust(direction);
if (isMuteAdjust && !isStreamAffectedByMute(streamType)) {
return;
}
// use stream type alias here so that streams with same alias have the same behavior,
// including with regard to silent mode control (e.g the use of STREAM_RING below and in
// checkForRingerModeChange() in place of STREAM_RING or STREAM_NOTIFICATION)
int streamTypeAlias = mStreamVolumeAlias[streamType];
if (isMuteAdjust && !isStreamAffectedByMute(streamTypeAlias)) {
return;
}
VolumeStreamState streamState = mStreamStates[streamTypeAlias];
final int device = getDeviceForStream(streamTypeAlias);