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

1 files changed, 3 insertions, 3 deletions

diff --git a/services/core/java/com/android/server/UiModeManagerService.java b/services/core/java/com/android/server/UiModeManagerService.java
index c65981bf0703..4976a63b016b 100644
--- a/services/core/java/com/android/server/UiModeManagerService.java
+++ b/services/core/java/com/android/server/UiModeManagerService.java
@@ -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;
         }