diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2014-11-26 16:57:08 +0900 |
|---|---|---|
| committer | Jinsuk Kim <jinsukkim@google.com> | 2014-11-26 17:02:18 +0900 |
| commit | 57d766f533f212d30c542cee98f31ca9630681a8 (patch) | |
| tree | f1ef0d88d8f91304c01430dbae05798bfac38146 /media/java | |
| parent | 8ae8500365e71c59cbe96f600371391ac8d245b8 (diff) | |
| download | frameworks_base-57d766f533f212d30c542cee98f31ca9630681a8.zip frameworks_base-57d766f533f212d30c542cee98f31ca9630681a8.tar.gz frameworks_base-57d766f533f212d30c542cee98f31ca9630681a8.tar.bz2 | |
Do not perform forceVolumeControlStream in master volume mode
The method should be no-op when in master volume mode.
Bug: 18250921
Change-Id: Iaab806db935ef97aa1124c3447e228d3eaef7584
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 645681a..febb979 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -1210,6 +1210,9 @@ public class AudioManager { * @hide */ public void forceVolumeControlStream(int streamType) { + if (mUseMasterVolume) { + return; + } IAudioService service = getService(); try { service.forceVolumeControlStream(streamType, mICallBack); |