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

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

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

View File

@@ -1887,7 +1887,10 @@ final class UiModeManagerService extends SystemService {
mComputedNightMode = false;
return;
}
resetNightModeOverrideLocked();
if (mNightMode != MODE_NIGHT_AUTO || (mTwilightManager != null
&& mTwilightManager.getLastTwilightState() != null)) {
resetNightModeOverrideLocked();
}
}
private boolean resetNightModeOverrideLocked() {