Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b2f6847 authored by Joe Bolinger's avatar Joe Bolinger
Browse files

Initalize view immediatly after construction to ensure all errors are processed. 

Fix: 190832013
Test: manual
Change-Id: I2ec603d74933712444daedb95efe9b44e741e5e0
parent e58036e1

packages/SystemUI/src/com/android/systemui/biometrics/AuthContainerView.java

+11 −7
Original line number Diff line number Diff line
@@ -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);

    }