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

Commit cb5cbf1e authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Automerger Merge Worker
Browse files

Merge "Fix NPEs in AuthContainerView" into tm-qpr-dev am: b8713e87 am: ae685a11 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19784818



Change-Id: I480210414c02654400e9e99bb899d62bb437bd3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f437c2c2 ae685a11

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

+33 −9
Original line number Diff line number Diff line
@@ -657,31 +657,51 @@ public class AuthContainerView extends LinearLayout 


    @Override

    public void onAuthenticationSucceeded(@Modality int modality) {

        if (mBiometricView != null) {

            mBiometricView.onAuthenticationSucceeded(modality);

        } else {

            Log.e(TAG, "onAuthenticationSucceeded(): mBiometricView is null");

        }

    }



    @Override

    public void onAuthenticationFailed(@Modality int modality, String failureReason) {

        if (mBiometricView != null) {

            mFailedModalities.add(modality);

            mBiometricView.onAuthenticationFailed(modality, failureReason);

        } else {

            Log.e(TAG, "onAuthenticationFailed(): mBiometricView is null");

        }

    }



    @Override

    public void onHelp(@Modality int modality, String help) {

        if (mBiometricView != null) {

            mBiometricView.onHelp(modality, help);

        } else {

            Log.e(TAG, "onHelp(): mBiometricView is null");

        }

    }



    @Override

    public void onError(@Modality int modality, String error) {

        if (mBiometricView != null) {

            mBiometricView.onError(modality, error);

        } else {

            Log.e(TAG, "onError(): mBiometricView is null");

        }

    }



    @Override

    public void onPointerDown() {

        if (mBiometricView != null) {

            if (mBiometricView.onPointerDown(mFailedModalities)) {

                Log.d(TAG, "retrying failed modalities (pointer down)");

                mBiometricCallback.onAction(AuthBiometricView.Callback.ACTION_BUTTON_TRY_AGAIN);

            }

        } else {

            Log.e(TAG, "onPointerDown(): mBiometricView is null");

        }

    }



    @Override
@@ -715,7 +735,11 @@ public class AuthContainerView extends LinearLayout 


    @Override

    public void animateToCredentialUI() {

        if (mBiometricView != null) {

            mBiometricView.startTransitionToCredentialUI();

        } else {

            Log.e(TAG, "animateToCredentialUI(): mBiometricView is null");

        }

    }



    void animateAway(@AuthDialogCallback.DismissedReason int reason) {