From 4624a1ca5d2ef4a8a860b6cfb167da260223e782 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Tue, 30 Jun 2020 18:12:59 -0700 Subject: [PATCH] Update settings together with frameworks/base Bug: 157790417 Test: SettingsRoboTests Change-Id: Ib99d1cc2cb3196dd7231d0b78403427467a787b2 --- .../fingerprint/FingerprintAuthenticateSidecar.java | 4 ++-- .../biometrics/fingerprint/FingerprintEnrollSidecar.java | 3 +-- .../fingerprint/FingerprintEnrollEnrollingTest.java | 1 - .../fingerprint/FingerprintEnrollFindSensorTest.java | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java index f5aae124f3e..426405627ab 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java @@ -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() { diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java index deb5a29556c..cbd9d4db241 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java @@ -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 diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index bfe7df307f2..3521f499f5a 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -93,7 +93,6 @@ public class FingerprintEnrollEnrollingTest { any(byte[].class), any(CancellationSignal.class), anyInt(), - anyInt(), callbackCaptor.capture()); return callbackCaptor.getValue(); diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java index 8be6b3084af..78ab49b0571 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java @@ -151,7 +151,6 @@ public class FingerprintEnrollFindSensorTest { any(byte[].class), any(CancellationSignal.class), anyInt(), - anyInt(), callbackCaptor.capture()); return callbackCaptor.getValue();