PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update settings together with frameworks/base"

Browse Source
This commit is contained in:
Kevin Chyn
2020-07-02 02:57:48 +00:00
committed by Android (Google) Code Review
parent 7c3bb2fc9b 4624a1ca5d
commit 2e7fc5a0d7
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
View File

@@ -103,8 +103,8 @@ public class FingerprintAuthenticateSidecar extends InstrumentedFragment {
public void startAuthentication(int userId) { public void startAuthentication(int userId) {
mCancellationSignal = new CancellationSignal(); mCancellationSignal = new CancellationSignal();
mFingerprintManager.authenticate(null, mCancellationSignal, 0 /* flags */, mFingerprintManager.authenticate(null /* crypto */, mCancellationSignal,
mAuthenticationCallback, null, userId); mAuthenticationCallback, null /* handler */, userId);
} }
public void stopAuthentication() { public void stopAuthentication() {

3
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
View File

@@ -40,8 +40,7 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
@Override @Override
protected void startEnrollment() { protected void startEnrollment() {
super.startEnrollment(); super.startEnrollment();
mFingerprintManager.enroll(mToken, mEnrollmentCancel, mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback);
0 /* flags */, mUserId, mEnrollmentCallback);
} }
private FingerprintManager.EnrollmentCallback mEnrollmentCallback private FingerprintManager.EnrollmentCallback mEnrollmentCallback

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

@@ -93,7 +93,6 @@ public class FingerprintEnrollEnrollingTest {
any(byte[].class), any(byte[].class),
any(CancellationSignal.class), any(CancellationSignal.class),
anyInt(), anyInt(),
anyInt(),
callbackCaptor.capture()); callbackCaptor.capture());
return callbackCaptor.getValue(); return callbackCaptor.getValue();

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

@@ -151,7 +151,6 @@ public class FingerprintEnrollFindSensorTest {
any(byte[].class), any(byte[].class),
any(CancellationSignal.class), any(CancellationSignal.class),
anyInt(), anyInt(),
anyInt(),
callbackCaptor.capture()); callbackCaptor.capture());
return callbackCaptor.getValue(); return callbackCaptor.getValue();