Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5a81559 authored by Alex Stetson's avatar Alex Stetson Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I7aae2b6659f3a24dbbf21c146b5a9139375f82cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0536329 305d1bc4

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

            }