Merge "Fix DND conditional null state" into nyc-dev
diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java
index a816b33..2a5aa8a 100644
--- a/src/com/android/settings/dashboard/conditional/DndCondition.java
+++ b/src/com/android/settings/dashboard/conditional/DndCondition.java
@@ -22,7 +22,9 @@
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Icon;
+import android.os.PersistableBundle;
import android.provider.Settings;
+import android.provider.Settings.Global;
import android.service.notification.ZenModeConfig;
import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -30,6 +32,7 @@
public class DndCondition extends Condition {
private static final String TAG = "DndCondition";
+ private static final String KEY_STATE = "state";
private int mZen;
private ZenModeConfig mConfig;
@@ -53,6 +56,18 @@
}
@Override
+ boolean saveState(PersistableBundle bundle) {
+ bundle.putInt(KEY_STATE, mZen);
+ return super.saveState(bundle);
+ }
+
+ @Override
+ void restoreState(PersistableBundle bundle) {
+ super.restoreState(bundle);
+ mZen = bundle.getInt(KEY_STATE, Global.ZEN_MODE_OFF);
+ }
+
+ @Override
protected Class<?> getReceiverClass() {
return Receiver.class;
}