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

2018-03-22 05:06:15 +00:00
parent 721c58deb4 b21dcf67da
commit e119601136
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;
+        }
    }
 }