From 31678f14e93952f501cb5b58c0caea212d6c95e2 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Tue, 19 Jul 2016 14:22:14 -0400 Subject: [PATCH] Protect against work conditional crash Change-Id: Iba6e7281c622e3ba34fa6bd4672b2380b0329808 Fixes: 30014085 --- .../settings/dashboard/conditional/WorkModeCondition.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java index 3d9958bf1c4..7924eef2fb2 100644 --- a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java +++ b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java @@ -90,7 +90,9 @@ public class WorkModeCondition extends Condition { @Override public void onActionClick(int index) { if (index == 0) { - mUm.trySetQuietModeDisabled(mUserHandle.getIdentifier(), null); + if (mUserHandle != null) { + mUm.trySetQuietModeDisabled(mUserHandle.getIdentifier(), null); + } setActive(false); } else { throw new IllegalArgumentException("Unexpected index " + index);