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
2014-11-26 21:39:08 +00:00
parent e986817a2d c69c8dc159
commit f657463a50
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);