Merge "Fix crash when pausing DndCondition." into pi-dev am: e119601136

am: d8b61c21a0 Change-Id: I7743c5d984e76c4223e88899311e60565c8ebb83
2018-03-22 05:39:07 +00:00
parent 8debb12ed0 d8b61c21a0
commit 175d61a01e
2 changed files with 18 additions and 2 deletions
--- a/src/com/android/settings/dashboard/conditional/DndCondition.java
+++ b/src/com/android/settings/dashboard/conditional/DndCondition.java
@@ -152,7 +152,9 @@ public class DndCondition extends Condition {

    @Override
    public void onPause() {
-        mManager.getContext().unregisterReceiver(mReceiver);
-        mRegistered = false;
+        if (mRegistered) {
+            mManager.getContext().unregisterReceiver(mReceiver);
+            mRegistered = false;
+        }
    }
 }