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

Merge "Update settings together with frameworks/base" am: 9096f09405

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12666925

Change-Id: I010dcccffb0a88eec07bf088d5a24c00d692c94e
This commit is contained in:
Kevin Chyn
2020-09-23 21:48:26 +00:00
committed by Automerger Merge Worker
parent 6ba136a86d 9096f09405
commit 282f092837
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) {

6
tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
View File

@@ -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<FingerprintSensorProperties> props = new ArrayList<>();
props.add(prop);
ShadowFingerprintManager.setSensorProperties(props);