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

This commit is contained in:
Alex Stetson
2022-12-16 16:30:52 +00:00
committed by Android (Google) Code Review

View File

@@ -723,7 +723,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");
@@ -746,7 +746,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;
}