From 8d63b982727c51863103e0e25cd8ee768147caa7 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Tue, 22 Sep 2020 21:30:58 -0700 Subject: [PATCH] Update settings together with frameworks/base Bug: 169195610 Test: Builds Change-Id: I2c732dba78eb8c90ef71351562415e06949b31bb --- .../settings/biometrics/BiometricEnrollActivity.java | 2 +- .../fingerprint/FingerprintEnrollIntroduction.java | 2 +- .../fingerprint/SetupFingerprintEnrollIntroductionTest.java | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java index f6f44a83867..bfdcd5b47be 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java +++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java @@ -241,7 +241,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity { final boolean maxFacesEnrolled = faceManager.getEnrolledFaces(mUserId).size() >= faceProperties.get(0).maxTemplatesAllowed; final boolean maxFingerprintsEnrolled = fingerprintManager.getEnrolledFingerprints(mUserId) - .size() >= fpProperties.get(0).maxTemplatesAllowed; + .size() >= fpProperties.get(0).maxEnrollmentsPerUser; if (maxFacesEnrolled) { mCheckboxFace.setEnabled(false); diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index dbbcef11566..61c837acc51 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -129,7 +129,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { final List props = mFingerprintManager.getSensorProperties(); // This will need to be updated for devices with multiple fingerprint sensors - final int max = props.get(0).maxTemplatesAllowed; + final int max = props.get(0).maxEnrollmentsPerUser; final int numEnrolledFingerprints = mFingerprintManager.getEnrolledFingerprints(mUserId).size(); if (numEnrolledFingerprints >= max) { diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java index 7427b5aaf7b..794560cc02b 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -23,6 +23,7 @@ import static org.robolectric.RuntimeEnvironment.application; import android.app.KeyguardManager; import android.content.Intent; import android.content.pm.PackageManager; +import android.hardware.biometrics.SensorProperties; import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintSensorProperties; import android.view.View; @@ -74,9 +75,10 @@ public class SetupFingerprintEnrollIntroductionTest { .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true); final FingerprintSensorProperties prop = new FingerprintSensorProperties(0 /* sensorId */, + SensorProperties.STRENGTH_STRONG, + 5 /* maxEnrollmentsPerUser */, FingerprintSensorProperties.TYPE_REAR, - true /* resetLockoutRequiresHardwareAuthToken */, - 5 /* maxTemplatesAllowed */); + true /* resetLockoutRequiresHardwareAuthToken */); final ArrayList props = new ArrayList<>(); props.add(prop); ShadowFingerprintManager.setSensorProperties(props);