diff options
| -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() { |