From c01232b16b95140ac2541498e87a98581524dea9 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Fri, 5 Feb 2021 12:52:31 -0800
Subject: [PATCH] Update fingerprint enroll together with frameworks/base

Bug: 179447737
Test: Builds
Change-Id: Ifccb96dbf51e610fb9cd1b238a6ef62350fb1169
---
 .../fingerprint/FingerprintEnrollEnrolling.java    |  4 +++-
 .../fingerprint/FingerprintEnrollFindSensor.java   |  2 +-
 .../fingerprint/FingerprintEnrollSidecar.java      | 14 ++++----------
 .../FingerprintEnrollEnrollingTest.java            |  2 +-
 .../FingerprintEnrollFindSensorTest.java           |  2 +-
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index d0c4f2853be..78abb58bd80 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -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
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 351c828fdc4..89cd4422636 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -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();
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index 73540c9e988..b6c3516dca5 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -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
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 41a55983f8b..9b39a034f0b 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 @@ public class FingerprintEnrollEnrollingTest {
                 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 f2ced9c4e96..55f0210dad4 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 @@ public class FingerprintEnrollFindSensorTest {
                 any(CancellationSignal.class),
                 anyInt(),
                 callbackCaptor.capture(),
-                eq(false));
+                eq(FingerprintManager.ENROLL_FIND_SENSOR));
 
         return callbackCaptor.getValue();
     }