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

Commit 33593e89 authored by Menghan Li's avatar Menghan Li Committed by Android (Google) Code Review
Browse files

Merge "fix(EDT) Correct caching of ForceInvertState" into main

parents 9408d873 0f439a1c

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

+3 −3
Original line number Diff line number Diff line
@@ -1410,10 +1410,10 @@ final class UiModeManagerService extends SystemService { 
    @GuardedBy("mLock")

    @ForceInvertType

    private int getForceInvertStateLocked() {

        if (mForceInvertStates.indexOfKey(mCurrentUser) < 0) {

        if (mForceInvertStates.indexOfKey(mCurrentUser) < 0 && mSystemReady) {

            updateForceInvertStateLocked();

        }

        return mForceInvertStates.get(mCurrentUser);

        return mForceInvertStates.get(mCurrentUser, FORCE_INVERT_TYPE_OFF);

    }



    /**
@@ -1423,7 +1423,7 @@ final class UiModeManagerService extends SystemService { 
    @GuardedBy("mLock")

    private boolean updateForceInvertStateLocked() {

        int forceInvertState = getForceInvertStateInternal();

        if (mForceInvertStates.get(mCurrentUser) != forceInvertState) {

        if (mForceInvertStates.get(mCurrentUser, Integer.MIN_VALUE) != forceInvertState) {

            mForceInvertStates.put(mCurrentUser, forceInvertState);

            return true;

        }