Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a0e40a7 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

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

* commit 'f17f04a5':
  Volume: Avoid making bad forceVolumeControlStream call.
parents d075d2f7 f17f04a5

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

+3 −1
Original line number Diff line number Diff line
@@ -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

            if (stream != STREAM_MASTER) {

                mAudioManager.forceVolumeControlStream(stream);

            }

            mDialog.show();

            if (mCallback != null) {

                mCallback.onVisible(true);