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

am 2bdf89b1: Merge "DO NOT MERGE Fix typo" into lmp-mr1-dev

Browse Source 
* commit '2bdf89b167d709e170150e5ae5bf888e6535c1fd':
  DO NOT MERGE Fix typo
This commit is contained in:
Sungsoo Lim
2015-01-06 00:18:35 +00:00
committed by Android Git Automerger
parent 9c8f8ed8a8 2bdf89b167
commit 31d73dce25
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); mAudioService.setMasterMute(!isMasterMute, flags, packageName, mICallback);
} else { } else {
mAudioService.adjustMasterVolume(direction, flags, packageName); mAudioService.adjustMasterVolume(direction, flags, packageName);
// Do not call setStreamMute when direction = 0 which is just to show // Do not call setMasterMute when direction = 0 which is used just to
// UI. // show the UI.
if (isMasterMute && direction != 0) { if (isMasterMute && direction != 0) {
mAudioService.setMasterMute(false, flags, packageName, mICallback); mAudioService.setMasterMute(false, flags, packageName, mICallback);
} }
@@ -849,8 +849,8 @@ public class MediaSessionService extends SystemService implements Monitor {
} else { } else {
mAudioService.adjustSuggestedStreamVolume(direction, suggestedStream, mAudioService.adjustSuggestedStreamVolume(direction, suggestedStream,
flags, packageName); flags, packageName);
// Do not call setStreamMute when direction = 0 which is just to show // Do not call setStreamMute when direction = 0 which is used just to
// UI. // show the UI.
if (isStreamMute && direction != 0) { if (isStreamMute && direction != 0) {
mAudioService.setStreamMute(suggestedStream, false, mICallback); mAudioService.setStreamMute(suggestedStream, false, mICallback);
} }