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

2014-11-26 16:32:36 +00:00
parent 038c144442 e506c85eaa
commit f17f04a51e
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
@@ -1178,7 +1178,9 @@ public class VolumePanel extends Handler implements DemoMode {
        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);