diff options
| -rw-r--r-- | services/core/java/com/android/server/UiModeManagerService.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java index 7daf15821047..f8857d3e152a 100644 --- a/services/core/java/com/android/server/UiModeManagerService.java +++ b/services/core/java/com/android/server/UiModeManagerService.java @@ -2064,12 +2064,14 @@ final class UiModeManagerService extends SystemService { private void updateComputedNightModeLocked(boolean activate) { boolean newComputedValue = activate; + boolean appliedOverrides = false; if (mNightMode.get() != MODE_NIGHT_YES && mNightMode.get() != UiModeManager.MODE_NIGHT_NO) { if (mOverrideNightModeOn && !newComputedValue) { newComputedValue = true; } else if (mOverrideNightModeOff && newComputedValue) { newComputedValue = false; } + appliedOverrides = true; } if (modesApi()) { @@ -2079,8 +2081,10 @@ final class UiModeManagerService extends SystemService { case (UiModeManager.MODE_ATTENTION_THEME_OVERLAY_DAY) -> false; default -> newComputedValue; // case OFF }; - } else { - mComputedNightMode = newComputedValue; + } + + if (appliedOverrides) { + return; } if (mNightMode.get() != MODE_NIGHT_AUTO || (mTwilightManager != null |