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

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

Change-Id: Ife43574f02d3778bf8f1c0795942c97545c6834d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jay Aliomer
2022-04-22 15:38:38 +00:00
committed by Automerger Merge Worker

View File

@@ -1803,8 +1803,11 @@ final class UiModeManagerService extends SystemService {
mComputedNightMode = false; mComputedNightMode = false;
return; return;
} }
if (mNightMode != MODE_NIGHT_AUTO || (mTwilightManager != null
&& mTwilightManager.getLastTwilightState() != null)) {
resetNightModeOverrideLocked(); resetNightModeOverrideLocked();
} }
}
private boolean resetNightModeOverrideLocked() { private boolean resetNightModeOverrideLocked() {
if (mOverrideNightModeOff || mOverrideNightModeOn) { if (mOverrideNightModeOff || mOverrideNightModeOn) {