summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bruno Martins <bgcngm@gmail.com> 2018-03-19 18:29:17 +0000
committer android-build-merger <android-build-merger@google.com> 2018-03-19 18:29:17 +0000
commit1fa90bc5a4053b40869e9c438690a45b9f1ed68d (patch)
treee8428e9648d6e0ee11c4dd044170e5a521b3850f
parente3a6b678c336d9372528c53cadaaa1519625e040 (diff)
parent2446a10799019d132eb16719cde141c84f3c05e1 (diff)
Merge "DndTile: Avoid yet another NPE during boot up phase"
am: 2446a10799 Change-Id: I211f94c3dedc4f288d436ba3aff7f52309a994d3
-rw-r--r--packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
index 52b4c0ac4e1a..9845c51acd36 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
@@ -174,6 +174,7 @@ public class DndTile extends QSTileImpl<BooleanState> {
@Override
protected void handleUpdateState(BooleanState state, Object arg) {
+ if (mController == null) return;
final int zen = arg instanceof Integer ? (Integer) arg : mController.getZen();
final boolean newValue = zen != ZEN_MODE_OFF;
final boolean valueChanged = state.value != newValue;