Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd40803f authored by Marcelo Arteiro's avatar Marcelo Arteiro
Browse files

Fixes issue that would switch dark mode off when in scheduled mode 

Bug: 324548844
Flag: EXEMPT bugfix
Test: Manual
Change-Id: Ie13a88f114112dfeb22fb6928892ae6d36fbb6e5
parent 5020a6ff

services/core/java/com/android/server/UiModeManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -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