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

Commit cf272d48 authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Android (Google) Code Review
Browse files

Merge "Fixes issue that would switch dark mode off when in scheduled mode" into main

parents 6ff9d1ea fd40803f

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

+6 −2
Original line number Original line Diff line number Diff line
@@ -2064,12 +2064,14 @@ final class UiModeManagerService extends SystemService { 




    private void updateComputedNightModeLocked(boolean activate) {

    private void updateComputedNightModeLocked(boolean activate) {

        boolean newComputedValue = activate;

        boolean newComputedValue = activate;

        boolean appliedOverrides = false;

        if (mNightMode.get() != MODE_NIGHT_YES && mNightMode.get() != UiModeManager.MODE_NIGHT_NO) {

        if (mNightMode.get() != MODE_NIGHT_YES && mNightMode.get() != UiModeManager.MODE_NIGHT_NO) {

            if (mOverrideNightModeOn && !newComputedValue) {

            if (mOverrideNightModeOn && !newComputedValue) {

                newComputedValue = true;

                newComputedValue = true;

            } else if (mOverrideNightModeOff && newComputedValue) {

            } else if (mOverrideNightModeOff && newComputedValue) {

                newComputedValue = false;

                newComputedValue = false;

            }

            }

            appliedOverrides = true;

        }

        }





        if (modesApi()) {

        if (modesApi()) {
@@ -2079,8 +2081,10 @@ final class UiModeManagerService extends SystemService { 
                case (UiModeManager.MODE_ATTENTION_THEME_OVERLAY_DAY) -> false;

                case (UiModeManager.MODE_ATTENTION_THEME_OVERLAY_DAY) -> false;

                default -> newComputedValue; // case OFF

                default -> newComputedValue; // case OFF

            };

            };

        } else {

        }

            mComputedNightMode = newComputedValue;



        if (appliedOverrides) {

            return;

        }

        }





        if (mNightMode.get() != MODE_NIGHT_AUTO || (mTwilightManager != null

        if (mNightMode.get() != MODE_NIGHT_AUTO || (mTwilightManager != null