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

Commit a18a8a1a authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Android (Google) Code Review
Browse files

Merge "Fail fingerprint enroll with error if HAT is null" into sc-dev

parents 8b668114 c6ced3fb
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ package com.android.settings.biometrics.fingerprint;
import android.app.Activity;
import android.app.settings.SettingsEnums;
import android.hardware.fingerprint.FingerprintManager;
import android.util.Log;

import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollSidecar;

@@ -27,6 +29,7 @@ import com.android.settings.biometrics.BiometricEnrollSidecar;
 * Sidecar fragment to handle the state around fingerprint enrollment.
 */
public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
    private static final String TAG = "FingerprintEnrollSidecar";

    private FingerprintManager mFingerprintManager;
    private @FingerprintManager.EnrollReason int mEnrollReason;
@@ -40,6 +43,14 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
    @Override
    protected void startEnrollment() {
        super.startEnrollment();

        if (mToken == null) {
            Log.e(TAG, "Null hardware auth token for enroll");
            onEnrollmentError(FingerprintManager.FINGERPRINT_ERROR_HW_UNAVAILABLE,
                    getString(R.string.fingerprint_intro_error_unknown));
            return;
        }

        mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback,
                mEnrollReason);
    }