From d8555b693ace6a6cdf3110334a8ed30f9bae49c6 Mon Sep 17 00:00:00 2001 From: Chandru S Date: Tue, 1 Aug 2023 17:36:09 -0700 Subject: [PATCH] Do not show the primary auth lockout dialog if the feature flag is enabled Test: verified manually Fixes: 293476896 Change-Id: I986c52b8e46f0d912c4511c9eb70a3fa5fe2ebdf --- .../keyguard/KeyguardSecurityContainerController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java index 3b09910fbe88a..aff25914ec363 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java @@ -27,6 +27,7 @@ import static com.android.keyguard.KeyguardSecurityContainer.USER_TYPE_PRIMARY; import static com.android.keyguard.KeyguardSecurityContainer.USER_TYPE_SECONDARY_USER; import static com.android.keyguard.KeyguardSecurityContainer.USER_TYPE_WORK_PROFILE; import static com.android.systemui.DejankUtils.whitelistIpcs; +import static com.android.systemui.flags.Flags.REVAMPED_BOUNCER_MESSAGES; import android.app.ActivityManager; import android.app.admin.DevicePolicyManager; @@ -1081,8 +1082,10 @@ public class KeyguardSecurityContainerController extends ViewController 0) { mLockPatternUtils.reportPasswordLockout(timeoutMs, userId); - mView.showTimeoutDialog(userId, timeoutMs, mLockPatternUtils, - mSecurityModel.getSecurityMode(userId)); + if (!mFeatureFlags.isEnabled(REVAMPED_BOUNCER_MESSAGES)) { + mView.showTimeoutDialog(userId, timeoutMs, mLockPatternUtils, + mSecurityModel.getSecurityMode(userId)); + } } }