From 8b2f68473be82170cae4145eebed8491b1a20320 Mon Sep 17 00:00:00 2001 From: Joe Bolinger Date: Fri, 11 Jun 2021 15:12:34 -0700 Subject: [PATCH] Initalize view immediatly after construction to ensure all errors are processed. Fix: 190832013 Test: manual Change-Id: I2ec603d74933712444daedb95efe9b44e741e5e0 --- .../systemui/biometrics/AuthContainerView.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java index d1cb6ec7a0726..c4f78e7782a21 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java @@ -376,6 +376,17 @@ public class AuthContainerView extends LinearLayout addView(mFrameLayout); + // init view before showing + if (mBiometricView != null) { + mBiometricView.setRequireConfirmation(mConfig.mRequireConfirmation); + mBiometricView.setPanelController(mPanelController); + mBiometricView.setPromptInfo(mConfig.mPromptInfo); + mBiometricView.setCallback(mBiometricCallback); + mBiometricView.setBackgroundView(mBackgroundView); + mBiometricView.setUserId(mConfig.mUserId); + mBiometricView.setEffectiveUserId(mEffectiveUserId); + } + // TODO: De-dupe the logic with AuthCredentialPasswordView setOnKeyListener((v, keyCode, event) -> { if (keyCode != KeyEvent.KEYCODE_BACK) { @@ -404,13 +415,6 @@ public class AuthContainerView extends LinearLayout } private void addBiometricView() { - mBiometricView.setRequireConfirmation(mConfig.mRequireConfirmation); - mBiometricView.setPanelController(mPanelController); - mBiometricView.setPromptInfo(mConfig.mPromptInfo); - mBiometricView.setCallback(mBiometricCallback); - mBiometricView.setBackgroundView(mBackgroundView); - mBiometricView.setUserId(mConfig.mUserId); - mBiometricView.setEffectiveUserId(mEffectiveUserId); mBiometricScrollView.addView(mBiometricView); }