commit 305d1bc4c3d713d06efd53d9378f704495821a7d
author Alex Stetson <alexstetson@google.com> Fri Dec 16 16:30:52 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 16 16:30:52 2022 +0000
tree 438702290d1916dac4528c9c2d94d65e34978310
parent 59af8cfca0feadfc57b174eecef308411c497d56
parent e28a3b8fa2143d0a1c9d539bb57cffff4cf00b1b

Merge "Use consistent method to get current user" into tm-qpr-dev

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 96ec43d..d231870 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -723,7 +723,7 @@
 
         @Override
         public void keyguardDone(boolean strongAuth, int targetUserId) {
-            if (targetUserId != mUserTracker.getUserId()) {
+            if (targetUserId != KeyguardUpdateMonitor.getCurrentUser()) {
                 return;
             }
             if (DEBUG) Log.d(TAG, "keyguardDone");
@@ -746,7 +746,7 @@
         public void keyguardDonePending(boolean strongAuth, int targetUserId) {
             Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardDonePending");
             if (DEBUG) Log.d(TAG, "keyguardDonePending");
-            if (targetUserId != mUserTracker.getUserId()) {
+            if (targetUserId != KeyguardUpdateMonitor.getCurrentUser()) {
                 Trace.endSection();
                 return;
             }