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

Commit c01232b1 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Update fingerprint enroll together with frameworks/base 

Bug: 179447737
Test: Builds
Change-Id: Ifccb96dbf51e610fb9cd1b238a6ef62350fb1169
parent 2eca234a

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

+3 −1
Original line number Diff line number Diff line
@@ -215,7 +215,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { 


    @Override

    protected BiometricEnrollSidecar getSidecar() {

        return new FingerprintEnrollSidecar();

        final FingerprintEnrollSidecar sidecar = new FingerprintEnrollSidecar();

        sidecar.setEnrollReason(FingerprintManager.ENROLL_ENROLL);

        return sidecar;

    }



    @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase { 
                FingerprintEnrollEnrolling.TAG_SIDECAR);

        if (mSidecar == null) {

            mSidecar = new FingerprintEnrollSidecar();

            mSidecar.logMetrics(false);

            mSidecar.setEnrollReason(FingerprintManager.ENROLL_FIND_SENSOR);

            getSupportFragmentManager().beginTransaction()

                    .add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR)

                    .commitAllowingStateLoss();

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

+4 −10
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import com.android.settings.biometrics.BiometricEnrollSidecar; 
public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {



    private FingerprintManager mFingerprintManager;

    private boolean mShouldLogMetrics = true;

    private @FingerprintManager.EnrollReason int mEnrollReason;



    @Override

    public void onAttach(Activity activity) {
@@ -41,17 +41,11 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar { 
    protected void startEnrollment() {

        super.startEnrollment();

        mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback,

                mShouldLogMetrics);

                mEnrollReason);

    }



    /**

     * Sets the flag mShouldLogMetrics which controls whether or not

     * logging of enrollment successes/failures will be recorded for

     * this particular instance of enrollment. This is primarily used by

     * the find sensor activity so that false negatives are not reported.

     */

    public void logMetrics(boolean shouldLogMetrics) {

        mShouldLogMetrics = shouldLogMetrics;

    public void setEnrollReason(@FingerprintManager.EnrollReason int enrollReason) {

        mEnrollReason = enrollReason;

    }



    private FingerprintManager.EnrollmentCallback mEnrollmentCallback

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ public class FingerprintEnrollEnrollingTest { 
                any(CancellationSignal.class),

                anyInt(),

                callbackCaptor.capture(),

                eq(true));

                eq(FingerprintManager.ENROLL_ENROLL));



        return callbackCaptor.getValue();

    }

tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class FingerprintEnrollFindSensorTest { 
                any(CancellationSignal.class),

                anyInt(),

                callbackCaptor.capture(),

                eq(false));

                eq(FingerprintManager.ENROLL_FIND_SENSOR));



        return callbackCaptor.getValue();

    }