From e28a3b8fa2143d0a1c9d539bb57cffff4cf00b1b Mon Sep 17 00:00:00 2001 From: Alex Stetson Date: Tue, 13 Dec 2022 11:34:50 -0800 Subject: [PATCH] Use consistent method to get current user Depending on the timing of the switching actions, the KeyguardUpdateMonitor and the user tracker may have different current users. We should use a consistent method for getting the current user in the KeyguardViewMediator Bug: 250675259 Test: manual Change-Id: I2b078ac21f0546d1b8de24f55e4225a754d53aea --- .../com/android/systemui/keyguard/KeyguardViewMediator.java | 4 ++-- 1 file changed, 2 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 306e92e6c96c4..0e1be009c94db 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -722,7 +722,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, @Override public void keyguardDone(boolean strongAuth, int targetUserId) { - if (targetUserId != mUserTracker.getUserId()) { + if (targetUserId != KeyguardUpdateMonitor.getCurrentUser()) { return; } if (DEBUG) Log.d(TAG, "keyguardDone"); @@ -745,7 +745,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 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; }