diff options
| author | John Spurlock <jspurlock@google.com> | 2015-06-03 15:17:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-03 15:17:55 +0000 |
| commit | dfe804416014c713df270d94f9c1c0f345eabb84 (patch) | |
| tree | 0cd6d994d85039bd3bd95a5f659d591e9ff19bf6 /packages | |
| parent | 736432edd2bbfd1873b26e987c9ca36470d831d4 (diff) | |
| parent | 75ae23c09674bede6d3fe5ec05a6fba47142e2d5 (diff) | |
| download | frameworks_base-dfe804416014c713df270d94f9c1c0f345eabb84.zip frameworks_base-dfe804416014c713df270d94f9c1c0f345eabb84.tar.gz frameworks_base-dfe804416014c713df270d94f9c1c0f345eabb84.tar.bz2 | |
Merge "Audio policy: setting explicit non-zero volume unmutes the stream." into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java index 09f7074..310a64c 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java @@ -726,11 +726,6 @@ public class VolumeDialog { } row.slider.setProgress(newProgress); } - if (mAutomute && mShowing) { - if (vlevel == 0 && !row.ss.muted && row.stream == AudioManager.STREAM_MUSIC) { - mController.setStreamMute(row.stream, true); - } - } } } @@ -934,16 +929,6 @@ public class VolumeDialog { final int userLevel = getImpliedLevel(seekBar, progress); if (mRow.ss.level != userLevel || mRow.ss.muted && userLevel > 0) { mRow.userAttempt = SystemClock.uptimeMillis(); - if (mAutomute) { - if (mRow.stream != AudioManager.STREAM_RING) { - if (userLevel > 0 && mRow.ss.muted) { - mController.setStreamMute(mRow.stream, false); - } - if (userLevel == 0 && mRow.ss.muteSupported && !mRow.ss.muted) { - mController.setStreamMute(mRow.stream, true); - } - } - } if (mRow.requestedLevel != userLevel) { mController.setStreamVolume(mRow.stream, userLevel); mRow.requestedLevel = userLevel; |