| commit | c0a53c142f85cfc446278fd6e788e951274138c7 | [log] [tgz] |
|---|---|---|
| author | Jay Aliomer <aaliomer@google.com> | Fri Apr 22 16:04:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 22 16:04:07 2022 +0000 |
| tree | 4cb751483950f471e1a042d11610b7baa9a6cd8d | |
| parent | ae1e423ee1fabdf559cc6d9ec1c61f243f9c8412 [diff] | |
| parent | 8371cf9fd7ca1041a93984af13b04aecb6bc8f82 [diff] |
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>
diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index e68a0a6..0afa8ca 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -1887,7 +1887,10 @@ mComputedNightMode = false; return; } - resetNightModeOverrideLocked(); + if (mNightMode != MODE_NIGHT_AUTO || (mTwilightManager != null + && mTwilightManager.getLastTwilightState() != null)) { + resetNightModeOverrideLocked(); + } } private boolean resetNightModeOverrideLocked() {