diff options
| author | 2018-02-06 21:07:29 +0000 | |
|---|---|---|
| committer | 2018-02-06 21:07:29 +0000 | |
| commit | 33903da4057cc4783e7c978338b2aa00a2d87888 (patch) | |
| tree | c729fd1d7577bea7af4969d5007e15cebf8dfd0c | |
| parent | bfd1f0c2092529262a34bd1f5ccf5d55e2179e87 (diff) | |
| parent | 0d73bc24e267931cf22249c9c8ddb6ab4867d86c (diff) | |
Merge "Don't change stream volume on mute"
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index a131a618512f..c622677ceb7e 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -396,13 +396,9 @@ public class VolumeDialogImpl implements VolumeDialog { if (hasVibrator) { mController.setRingerMode(AudioManager.RINGER_MODE_VIBRATE, false); } else { - final boolean wasZero = ss.level == 0; - mController.setStreamVolume(AudioManager.STREAM_RING, wasZero ? 1 : 0); mController.setRingerMode(AudioManager.RINGER_MODE_SILENT, false); } } else if (mState.ringerModeInternal == AudioManager.RINGER_MODE_VIBRATE) { - final boolean wasZero = ss.level == 0; - mController.setStreamVolume(AudioManager.STREAM_RING, wasZero ? 1 : 0); mController.setRingerMode(AudioManager.RINGER_MODE_SILENT, false); } else { mController.setRingerMode(AudioManager.RINGER_MODE_NORMAL, false); |