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

Commit 75c47832 authored by Jian-Yang Liu's avatar Jian-Yang Liu Committed by Android (Google) Code Review
Browse files

Merge "Updated UiModeManagerService to always trigger configuration change for... 

Merge "Updated UiModeManagerService to always trigger configuration change for setNightMode if it is AAE."
parents 330ef764 b444a977

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

+8 −3
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ import java.util.HashMap; 
import java.util.Map;

import java.util.Set;





final class UiModeManagerService extends SystemService {

    private static final String TAG = UiModeManager.class.getSimpleName();

    private static final boolean LOG = false;
@@ -105,6 +104,7 @@ final class UiModeManagerService extends SystemService { 
    private boolean mCarModeKeepsScreenOn;

    private boolean mDeskModeKeepsScreenOn;

    private boolean mTelevision;

    private boolean mCar;

    private boolean mWatch;

    private boolean mVrHeadset;

    private boolean mComputedNightMode;
@@ -212,10 +212,14 @@ final class UiModeManagerService extends SystemService { 
        public void onTwilightStateChanged(@Nullable TwilightState state) {

            synchronized (mLock) {

                if (mNightMode == UiModeManager.MODE_NIGHT_AUTO) {

                    if (mCar) {

                        updateLocked(0, 0);

                    } else {

                        registerScreenOffEvent();

                    }

                }

            }

        }

    };



    /**
@@ -330,6 +334,7 @@ final class UiModeManagerService extends SystemService { 
        final PackageManager pm = context.getPackageManager();

        mTelevision = pm.hasSystemFeature(PackageManager.FEATURE_TELEVISION)

                || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK);

        mCar = pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);

        mWatch = pm.hasSystemFeature(PackageManager.FEATURE_WATCH);



        updateNightModeFromSettings(context, res, UserHandle.getCallingUserId());
@@ -557,7 +562,7 @@ final class UiModeManagerService extends SystemService { 
                        mNightMode = mode;

                        mNightModeOverride = mode;

                        // on screen off will update configuration instead

                        if (mNightMode != UiModeManager.MODE_NIGHT_AUTO) {

                        if (mNightMode != UiModeManager.MODE_NIGHT_AUTO || mCar) {

                            updateLocked(0, 0);

                        } else {

                            registerScreenOffEvent();