Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use consistent method to get current user" into tm-qpr-dev am: 305d1bc4c3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20725183

Change-Id: I7aae2b6659f3a24dbbf21c146b5a9139375f82cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Stetson
2022-12-16 16:43:19 +00:00
committed by Automerger Merge Worker
parent c0536329ac 305d1bc4c3
commit a5a8155976
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -723,7 +723,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
@Override @Override
public void keyguardDone(boolean strongAuth, int targetUserId) { public void keyguardDone(boolean strongAuth, int targetUserId) {
if (targetUserId != mUserTracker.getUserId()) { if (targetUserId != KeyguardUpdateMonitor.getCurrentUser()) {
return; return;
} }
if (DEBUG) Log.d(TAG, "keyguardDone"); if (DEBUG) Log.d(TAG, "keyguardDone");
@@ -746,7 +746,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
public void keyguardDonePending(boolean strongAuth, int targetUserId) { public void keyguardDonePending(boolean strongAuth, int targetUserId) {
Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardDonePending"); Trace.beginSection("KeyguardViewMediator.mViewMediatorCallback#keyguardDonePending");
if (DEBUG) Log.d(TAG, "keyguardDonePending"); if (DEBUG) Log.d(TAG, "keyguardDonePending");
if (targetUserId != mUserTracker.getUserId()) { if (targetUserId != KeyguardUpdateMonitor.getCurrentUser()) {
Trace.endSection(); Trace.endSection();
return; return;
} }