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

Commit b7c71e8d authored by Jay Aliomer's avatar Jay Aliomer Committed by Automerger Merge Worker
Browse files

Merge "Dark Theme "TURN ON UNTIL SUNRISE" is not retained after reboot" am:... 

Merge "Dark Theme "TURN ON UNTIL SUNRISE" is not retained after reboot" am: 5b1ff789 am: 8371cf9f am: c0a53c14 am: 87e0d50f am: 773bc369

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2062852



Change-Id: I7c32062a86defc9e6a0104020495e8138cd49a1c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7fe4e5d9 773bc369

services/core/java/com/android/server/UiModeManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -1887,8 +1887,11 @@ final class UiModeManagerService extends SystemService { 
            mComputedNightMode = false;

            return;

        }

        if (mNightMode != MODE_NIGHT_AUTO || (mTwilightManager != null

                && mTwilightManager.getLastTwilightState() != null)) {

            resetNightModeOverrideLocked();

        }

    }



    private boolean resetNightModeOverrideLocked() {

        if (mOverrideNightModeOff || mOverrideNightModeOn) {