Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev

2014-11-26 21:27:16 +00:00
parent ca84c8b1b0 57d766f533
commit bc3226e21d
1 changed files with 3 additions and 0 deletions
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@ -1245,6 +1245,9 @@ public class AudioManager {
     * @hide
     */
    public void forceVolumeControlStream(int streamType) {
+        if (mUseMasterVolume) {
+            return;
+        }
        IAudioService service = getService();
        try {
            service.forceVolumeControlStream(streamType, mICallBack);