am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev (31d73dce) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/media/MediaSessionService.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -836,8 +836,8 @@ public class MediaSessionService extends SystemService implements Monitor {
		mAudioService.setMasterMute(!isMasterMute, flags, packageName, mICallback);
		} else {
		mAudioService.adjustMasterVolume(direction, flags, packageName);
		// Do not call setStreamMute when direction = 0 which is just to show
		// UI.
		// Do not call setMasterMute when direction = 0 which is used just to
		// show the UI.
		if (isMasterMute && direction != 0) {
		mAudioService.setMasterMute(false, flags, packageName, mICallback);
		}
		@@ -849,8 +849,8 @@ public class MediaSessionService extends SystemService implements Monitor {
		} else {
		mAudioService.adjustSuggestedStreamVolume(direction, suggestedStream,
		flags, packageName);
		// Do not call setStreamMute when direction = 0 which is just to show
		// UI.
		// Do not call setStreamMute when direction = 0 which is used just to
		// show the UI.
		if (isStreamMute && direction != 0) {
		mAudioService.setStreamMute(suggestedStream, false, mICallback);
		}