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

1 files changed, 3 insertions, 0 deletions

diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 0642bcdd793f..e61b5638dd84 100644
--- 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);