diff options
| author | 2022-04-22 15:14:57 +0000 | |
|---|---|---|
| committer | 2022-04-22 15:14:57 +0000 | |
| commit | 5b1ff7891bb34c8bc6a961081ae256e5c1931cef (patch) | |
| tree | c8931a637c7f6de62fe6a526ccd83556bf5b57e6 | |
| parent | e441813c5ff1fe9b29d101f07787062ef999dbaf (diff) | |
| parent | 3847d7ed9a6fabe08722102b3dfb46ca1545332e (diff) | |
Merge "Dark Theme "TURN ON UNTIL SUNRISE" is not retained after reboot"
| -rw-r--r-- | services/core/java/com/android/server/UiModeManagerService.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index 81627a05c9a4..2ab477f7dd17 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -1803,7 +1803,10 @@ final class UiModeManagerService extends SystemService { mComputedNightMode = false; return; } - resetNightModeOverrideLocked(); + if (mNightMode != MODE_NIGHT_AUTO || (mTwilightManager != null + && mTwilightManager.getLastTwilightState() != null)) { + resetNightModeOverrideLocked(); + } } private boolean resetNightModeOverrideLocked() { |