Don't change stream volume on mute

Setting ringer to silent is enough to silence all sounds on the ringer
stream.

Test: manual
Change-Id: I1700c08a36d3f70b0f798fb48769fe3a69c62f9b
Fixes: 72800255
This commit is contained in:
Julia Reynolds
2018-02-06 09:02:12 -05:00
parent 348f19e6a3
commit 0d73bc24e2

View File

@@ -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);