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

2022-04-22 15:14:57 +00:00
parent e441813c5f 3847d7ed9a
commit 5b1ff7891b
1 changed files with 4 additions and 1 deletions
--- 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() {