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

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

Browse Source 
* commit '4a0e40a76431cc4ea0c052ea9106616593c1a3de':
  Volume: Avoid making bad forceVolumeControlStream call.
This commit is contained in:
John Spurlock
2014-11-26 18:45:10 +00:00
committed by Android Git Automerger
parent 06e83b3d5a 4a0e40a764
commit b20cdd3b6b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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
mAudioManager.forceVolumeControlStream(stream); if (stream != STREAM_MASTER) {
mAudioManager.forceVolumeControlStream(stream);
}
mDialog.show(); mDialog.show();
if (mCallback != null) { if (mCallback != null) {
mCallback.onVisible(true); mCallback.onVisible(true);