Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 77fc052d authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge \"Fix DND conditional null state\" into nyc-dev

am: 733649c2

Change-Id: Icd64312b660dc1c098772f97731241a9c9a6032c
parents 98fd2d2a 733649c2
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ import android.content.BroadcastReceiver;
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 @@ import com.android.settings.R;
public class DndCondition extends Condition {

    private static final String TAG = "DndCondition";
    private static final String KEY_STATE = "state";

    private int mZen;
    private ZenModeConfig mConfig;
@@ -52,6 +55,18 @@ public class DndCondition extends Condition {
        setActive(zenModeEnabled);
    }

    @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;