From 57d766f533f212d30c542cee98f31ca9630681a8 Mon Sep 17 00:00:00 2001
From: Jinsuk Kim <jinsukkim@google.com>
Date: Wed, 26 Nov 2014 16:57:08 +0900
Subject: [PATCH] Do not perform forceVolumeControlStream in master volume mode

The method should be no-op when in master volume mode.

Bug: 18250921

Change-Id: Iaab806db935ef97aa1124c3447e228d3eaef7584
---
 media/java/android/media/AudioManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 645681a38de4b..febb9790a0c9e 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);