commit f657463a500e90acb2fa9991cd67629199ef7ab4
author Jinsuk Kim <jinsukkim@google.com> Wed Nov 26 21:39:08 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 26 21:39:08 2014 +0000
tree 3883d7d19e43bb4c3536fbf6f6056aa38f5e3a08
parent e986817a2dc8a412c12e456319965a67ac60f236
parent c69c8dc15972179728932f91dde483e9d61f34a9

am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev

* commit 'c69c8dc15972179728932f91dde483e9d61f34a9':
  Do not perform forceVolumeControlStream in master volume mode

media/java/android/media/AudioManager.java

diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index 0642bcd..e61b563 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -1245,6 +1245,9 @@
      * @hide
      */
     public void forceVolumeControlStream(int streamType) {
+        if (mUseMasterVolume) {
+            return;
+        }
         IAudioService service = getService();
         try {
             service.forceVolumeControlStream(streamType, mICallBack);