Merge \"Protect against work conditional crash\" into nyc-mr1-dev

am: bd6a4f9066 Change-Id: I6072b6235abb35da9ecac1f41b01cf82e75d868b
2016-07-20 13:33:57 +00:00
parent 5d8b1ca588 bd6a4f9066
commit ff1132470b
1 changed files with 3 additions and 1 deletions
--- 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) {
+            if (mUserHandle != null) {
                mUm.trySetQuietModeDisabled(mUserHandle.getIdentifier(), null);
+            }
            setActive(false);
        } else {
            throw new IllegalArgumentException("Unexpected index " + index);