Update fingerprint enroll together with frameworks/base
Bug: 179447737
Test: Builds
Change-Id: Ifccb96dbf51e610fb9cd1b238a6ef62350fb1169
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index d0c4f28..78abb58 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -215,7 +215,9 @@
@Override
protected BiometricEnrollSidecar getSidecar() {
- return new FingerprintEnrollSidecar();
+ final FingerprintEnrollSidecar sidecar = new FingerprintEnrollSidecar();
+ sidecar.setEnrollReason(FingerprintManager.ENROLL_ENROLL);
+ return sidecar;
}
@Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 351c828..89cd442 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -122,7 +122,7 @@
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();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index 73540c9..b6c3516 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -29,7 +29,7 @@
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 @@
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
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 41a5598..9b39a03 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -97,7 +97,7 @@
any(CancellationSignal.class),
anyInt(),
callbackCaptor.capture(),
- eq(true));
+ eq(FingerprintManager.ENROLL_ENROLL));
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 f2ced9c..55f0210 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -153,7 +153,7 @@
any(CancellationSignal.class),
anyInt(),
callbackCaptor.capture(),
- eq(false));
+ eq(FingerprintManager.ENROLL_FIND_SENSOR));
return callbackCaptor.getValue();
}