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

Commit 6947d508 authored by Joshua Mccloskey's avatar Joshua Mccloskey Committed by Android (Google) Code Review
Browse files

Merge "Clear FP error only on progress." into tm-qpr-dev

parents 81224f09 28c0d904

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

+5 −1
Original line number Diff line number Diff line
@@ -508,7 +508,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 
    public void onEnrollmentProgressChange(int steps, int remaining) {

        updateProgress(true /* animate */);

        updateTitleAndDescription();

        clearError();

        animateFlash();

        if (!mCanAssumeUdfps) {

            mErrorText.removeCallbacks(mTouchAgainRunnable);
@@ -537,6 +536,11 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 


        int progress = getProgress(

                mSidecar.getEnrollmentSteps(), mSidecar.getEnrollmentRemaining());

        // Only clear the error when progress has been made.

        // TODO (b/234772728) Add tests.

        if (mProgressBar != null && mProgressBar.getProgress() < progress) {

            clearError();

        }

        if (animate) {

            animateProgress(progress);

        } else {