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

Update fingerprint enroll together with frameworks/base

Browse Source 
Bug: 179447737
Test: Builds
Change-Id: Ifccb96dbf51e610fb9cd1b238a6ef62350fb1169
This commit is contained in:
Kevin Chyn
2021-02-05 12:52:31 -08:00
parent 2eca234af7
commit c01232b16b
5 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,7 +215,9 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
@Override @Override
protected BiometricEnrollSidecar getSidecar() { protected BiometricEnrollSidecar getSidecar() {
return new FingerprintEnrollSidecar(); final FingerprintEnrollSidecar sidecar = new FingerprintEnrollSidecar();
sidecar.setEnrollReason(FingerprintManager.ENROLL_ENROLL);
return sidecar;
} }
@Override @Override

2
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
View File

@@ -122,7 +122,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {
FingerprintEnrollEnrolling.TAG_SIDECAR); FingerprintEnrollEnrolling.TAG_SIDECAR);
if (mSidecar == null) { if (mSidecar == null) {
mSidecar = new FingerprintEnrollSidecar(); mSidecar = new FingerprintEnrollSidecar();
mSidecar.logMetrics(false); mSidecar.setEnrollReason(FingerprintManager.ENROLL_FIND_SENSOR);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()
.add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR) .add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR)
.commitAllowingStateLoss(); .commitAllowingStateLoss();

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

@@ -29,7 +29,7 @@ import com.android.settings.biometrics.BiometricEnrollSidecar;
public class FingerprintEnrollSidecar extends BiometricEnrollSidecar { public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
private FingerprintManager mFingerprintManager; private FingerprintManager mFingerprintManager;
private boolean mShouldLogMetrics = true; private @FingerprintManager.EnrollReason int mEnrollReason;
@Override @Override
public void onAttach(Activity activity) { public void onAttach(Activity activity) {
@@ -41,17 +41,11 @@ public class FingerprintEnrollSidecar extends BiometricEnrollSidecar {
protected void startEnrollment() { protected void startEnrollment() {
super.startEnrollment(); super.startEnrollment();
mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback, mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback,
mShouldLogMetrics); mEnrollReason);
} }
/** public void setEnrollReason(@FingerprintManager.EnrollReason int enrollReason) {
* Sets the flag mShouldLogMetrics which controls whether or not mEnrollReason = enrollReason;
* 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;
} }
private FingerprintManager.EnrollmentCallback mEnrollmentCallback private FingerprintManager.EnrollmentCallback mEnrollmentCallback

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

@@ -97,7 +97,7 @@ public class FingerprintEnrollEnrollingTest {
any(CancellationSignal.class), any(CancellationSignal.class),
anyInt(), anyInt(),
callbackCaptor.capture(), callbackCaptor.capture(),
eq(true)); eq(FingerprintManager.ENROLL_ENROLL));
return callbackCaptor.getValue(); return callbackCaptor.getValue();
} }

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

@@ -153,7 +153,7 @@ public class FingerprintEnrollFindSensorTest {
any(CancellationSignal.class), any(CancellationSignal.class),
anyInt(), anyInt(),
callbackCaptor.capture(), callbackCaptor.capture(),
eq(false)); eq(FingerprintManager.ENROLL_FIND_SENSOR));
return callbackCaptor.getValue(); return callbackCaptor.getValue();
} }