commit f17f04a51e1e0b7f16d7c53015d0a66059b80cd3
author John Spurlock <jspurlock@google.com> Wed Nov 26 16:32:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 26 16:32:38 2014 +0000
tree d7bad5456937a21ea300bdaca9f22ca50fed0b19
parent 038c144442683a633339773d23dd61cb826cad10
parent e506c85eaa0b81359b6472825bec038750fae6d7

Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev

packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java

diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
index 1fe4698..aaf5d5f 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
@@ -1178,7 +1178,9 @@
         if (!isShowing()) {
             int stream = (streamType == STREAM_REMOTE_MUSIC) ? -1 : streamType;
             // when the stream is for remote playback, use -1 to reset the stream type evaluation
-            mAudioManager.forceVolumeControlStream(stream);
+            if (stream != STREAM_MASTER) {
+                mAudioManager.forceVolumeControlStream(stream);
+            }
             mDialog.show();
             if (mCallback != null) {
                 mCallback.onVisible(true);