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

Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev

Browse Source
This commit is contained in:
Sungsoo Lim
2015-01-06 00:13:12 +00:00
committed by Android (Google) Code Review
parent 4a5baeaec9 d5489220e2
commit 2bdf89b167
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/media/MediaSessionService.java
View File

@@ -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);
}