Merge "Revert "Fix bouncer race condition"" into rvc-dev am: 806eb82b9b am: e31de97899 (376c8669) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -19,9 +19,7 @@ import static android.view.ViewRootImpl.NEW_INSETS_MODE_FULL;
		import static android.view.ViewRootImpl.sNewInsetsMode;
		import static android.view.WindowInsets.Type.ime;
		import static android.view.WindowInsets.Type.systemBars;

		import static com.android.systemui.DejankUtils.whitelistIpcs;

		import static java.lang.Integer.max;

		import android.app.Activity;
		@@ -30,6 +28,7 @@ import android.app.admin.DevicePolicyManager;
		import android.content.Context;
		import android.content.Intent;
		import android.content.res.ColorStateList;
		import android.graphics.Rect;
		import android.metrics.LogMaker;
		import android.os.Handler;
		import android.os.Looper;
		@@ -512,8 +511,6 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
		boolean finish = false;
		boolean strongAuth = false;
		int eventSubtype = -1;
		mCurrentSecuritySelection = whitelistIpcs(() ->
		mSecurityModel.getSecurityMode(targetUserId));
		if (mUpdateMonitor.getUserHasTrust(targetUserId)) {
		finish = true;
		eventSubtype = BOUNCER_DISMISS_EXTENDED_ACCESS;
		@@ -521,8 +518,13 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
		finish = true;
		eventSubtype = BOUNCER_DISMISS_BIOMETRIC;
		} else if (SecurityMode.None == mCurrentSecuritySelection) {
		SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
		if (SecurityMode.None == securityMode) {
		finish = true; // no security required
		eventSubtype = BOUNCER_DISMISS_NONE_SECURITY;
		} else {
		showSecurityScreen(securityMode); // switch to the alternate security view
		}
		} else if (authenticated) {
		switch (mCurrentSecuritySelection) {
		case Pattern: