Merge "Use the unresolved stream type for mute checking." (ffeee4b5) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/audio/AudioService.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -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);