Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
John Spurlock
2014-11-26 16:32:36 +00:00
committed by Android (Google) Code Review
parent 038c144442 e506c85eaa
commit f17f04a51e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
View File

@@ -1178,7 +1178,9 @@ public class VolumePanel extends Handler implements DemoMode {
if (!isShowing()) { if (!isShowing()) {
int stream = (streamType == STREAM_REMOTE_MUSIC) ? -1 : streamType; int stream = (streamType == STREAM_REMOTE_MUSIC) ? -1 : streamType;
// when the stream is for remote playback, use -1 to reset the stream type evaluation // when the stream is for remote playback, use -1 to reset the stream type evaluation
if (stream != STREAM_MASTER) {
mAudioManager.forceVolumeControlStream(stream); mAudioManager.forceVolumeControlStream(stream);
}
mDialog.show(); mDialog.show();
if (mCallback != null) { if (mCallback != null) {
mCallback.onVisible(true); mCallback.onVisible(true);