Merge "Use consistent method to get current user" into tm-qpr-dev (305d1bc4) · Commits · e / os / android_frameworks_base

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;
		}