From 99e1677ee0789b5a01ce3c0a905b43444b3afc6e Mon Sep 17 00:00:00 2001
From: Josh Tsuji <tsuji@google.com>
Date: Thu, 30 Jan 2025 17:14:52 -0500
Subject: Flag guard additional reads of mGoingAwayRequestedForUserId, since
 this value is not set with the refactor enabled.

Flag: com.android.systemui.keyguard_wm_state_refactor
Bug: 278086361
Test: unlock with flag enabled
Change-Id: I7980a7d12d5f376737e54f82f06f9363a78f8bc8
---
 .../src/com/android/systemui/keyguard/KeyguardViewMediator.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 7fed7d253efe..fd50485fc3a3 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -3249,7 +3249,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
         Log.d(TAG, "handleStartKeyguardExitAnimation startTime=" + startTime
                 + " fadeoutDuration=" + fadeoutDuration);
         int currentUserId = mSelectedUserInteractor.getSelectedUserId();
-        if (mGoingAwayRequestedForUserId != currentUserId) {
+        if (!KeyguardWmStateRefactor.isEnabled() && mGoingAwayRequestedForUserId != currentUserId) {
             Log.e(TAG, "Not executing handleStartKeyguardExitAnimationInner() due to userId "
                     + "mismatch. Requested: " + mGoingAwayRequestedForUserId + ", current: "
                     + currentUserId);
@@ -3516,7 +3516,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
      * app transition before finishing the current RemoteAnimation, or the keyguard being re-shown).
      */
     private void handleCancelKeyguardExitAnimation() {
-        if (mGoingAwayRequestedForUserId != mSelectedUserInteractor.getSelectedUserId()) {
+        if (!KeyguardWmStateRefactor.isEnabled()
+                && mGoingAwayRequestedForUserId != mSelectedUserInteractor.getSelectedUserId()) {
             Log.e(TAG, "Setting pendingLock = true due to userId mismatch. Requested: "
                     + mGoingAwayRequestedForUserId + ", current: "
                     + mSelectedUserInteractor.getSelectedUserId());
-- 
cgit v1.2.3-59-g8ed1b