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-09-23 21:33:35 +00:00
committed by Android (Google) Code Review
parent 1fa6f33033 8d63b98272
commit 9096f09405
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/biometrics/BiometricEnrollActivity.java
View File

@@ -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);

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

@@ -129,7 +129,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
final List<FingerprintSensorProperties> 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) {