Merge "Don't show the security screen on devicePolicyManager changes" into main (c81039a8) · Commits · e / os / android_frameworks_base

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

+23 −1

Original line number	Diff line number	Diff line
		@@ -429,8 +429,30 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard

		@Override
		public void onDevicePolicyManagerStateChanged() {
		if (Flags.bouncerLifecycleFix()) {
		// Update the current security mode without showing it
		SecurityMode currSecurityMode = whitelistIpcs(
		() -> mSecurityModel.getSecurityMode(
		mSelectedUserInteractor.getSelectedUserId())
		);
		if (DEBUG) {
		Log.d(TAG, "onDevicePolicyManagerStateChanged("
		+ currSecurityMode + ")");
		}

		if (currSecurityMode == SecurityMode.Invalid
		\|\| currSecurityMode == mCurrentSecurityMode
		\|\| currSecurityMode == SimPuk
		\|\| currSecurityMode == SimPin) {
		return;
		}

		getCurrentSecurityController(oldView -> oldView.onPause());
		mCurrentSecurityMode = currSecurityMode;
		} else {
		showPrimarySecurityScreen(false);
		}
		}
		};
		private final SelectedUserInteractor mSelectedUserInteractor;
		private final Provider<DeviceEntryInteractor> mDeviceEntryInteractor;