From 41eae630b38e49fd031d5ee14a06a9bb62a77d49 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Tue, 9 Jan 2018 09:21:44 -0500 Subject: Guard against crash on startup Change-Id: I06f4ccba63cef7eb0971d8b0bfa143de2ed5e53a Fixes: 71636566 Test: manual; boottest --- .../SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index d7c80101b287..7b91f1475ca2 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -413,6 +413,9 @@ public class VolumeDialogImpl implements VolumeDialog { Events.writeEvent(mContext, Events.EVENT_ICON_CLICK, AudioManager.STREAM_RING, mRingerIcon.getTag()); final StreamState ss = mState.states.get(AudioManager.STREAM_RING); + if (ss == null) { + return; + } final boolean hasVibrator = mController.hasVibrator(); if (mState.ringerModeInternal == AudioManager.RINGER_MODE_NORMAL) { if (hasVibrator) { @@ -617,6 +620,9 @@ public class VolumeDialogImpl implements VolumeDialog { protected void updateRingerH() { if (mState != null) { final StreamState ss = mState.states.get(AudioManager.STREAM_RING); + if (ss == null) { + return; + } switch (mState.ringerModeInternal) { case AudioManager.RINGER_MODE_VIBRATE: mRingerStatus.setText(R.string.volume_ringer_status_vibrate); -- cgit v1.2.3-59-g8ed1b