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

Commit 2e7fc5a0 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Update settings together with frameworks/base"

parents 7c3bb2fc 4624a1ca

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

+2 −2
Original line number Diff line number Diff line
@@ -103,8 +103,8 @@ public class FingerprintAuthenticateSidecar extends InstrumentedFragment { 


    public void startAuthentication(int userId) {

        mCancellationSignal = new CancellationSignal();

        mFingerprintManager.authenticate(null, mCancellationSignal, 0 /* flags */,

                mAuthenticationCallback, null, userId);

        mFingerprintManager.authenticate(null /* crypto */, mCancellationSignal,

                mAuthenticationCallback, null /* handler */, userId);

    }



    public void stopAuthentication() {

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

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar { 
    @Override

    protected void startEnrollment() {

        super.startEnrollment();

        mFingerprintManager.enroll(mToken, mEnrollmentCancel,

                0 /* flags */, mUserId, mEnrollmentCallback);

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

    }



    private FingerprintManager.EnrollmentCallback mEnrollmentCallback

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

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ public class FingerprintEnrollEnrollingTest { 
                any(byte[].class),

                any(CancellationSignal.class),

                anyInt(),

                anyInt(),

                callbackCaptor.capture());



        return callbackCaptor.getValue();

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

+0 −1
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ public class FingerprintEnrollFindSensorTest { 
                any(byte[].class),

                any(CancellationSignal.class),

                anyInt(),

                anyInt(),

                callbackCaptor.capture());



        return callbackCaptor.getValue();