diff options
| author | RoboErik <epastern@google.com> | 2015-02-05 23:23:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-05 23:23:16 +0000 |
| commit | 5387988fc9881e7e9ac0d1ed95804253ad9adb40 (patch) | |
| tree | 40abb4051a1b8a7f86c54aec81ebf78900fb4269 /media | |
| parent | f5a7df1576c538b60f9da21a8d0c7db498c02ad1 (diff) | |
| parent | 4fa359e86d797b078967e0ad30d6a2cb19669707 (diff) | |
| download | frameworks_base-5387988fc9881e7e9ac0d1ed95804253ad9adb40.zip frameworks_base-5387988fc9881e7e9ac0d1ed95804253ad9adb40.tar.gz frameworks_base-5387988fc9881e7e9ac0d1ed95804253ad9adb40.tar.bz2 | |
Merge "Make isStreamMute correctly handle master volume devices"
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioManager.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 912d644..07b19a4 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -1191,7 +1191,11 @@ public class AudioManager { public boolean isStreamMute(int streamType) { IAudioService service = getService(); try { - return service.isStreamMute(streamType); + if (mUseMasterVolume) { + return service.isMasterMute(); + } else { + return service.isStreamMute(streamType); + } } catch (RemoteException e) { Log.e(TAG, "Dead object in isStreamMute", e); return false; |