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

Update settings together with frameworks/base

Browse Source 
Bug: 169195610
Test: Builds
Change-Id: I2c732dba78eb8c90ef71351562415e06949b31bb
This commit is contained in:
Kevin Chyn
2020-09-22 21:30:58 -07:00
parent a6575f9bb8
commit 8d63b98272
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() final boolean maxFacesEnrolled = faceManager.getEnrolledFaces(mUserId).size()
>= faceProperties.get(0).maxTemplatesAllowed; >= faceProperties.get(0).maxTemplatesAllowed;
final boolean maxFingerprintsEnrolled = fingerprintManager.getEnrolledFingerprints(mUserId) final boolean maxFingerprintsEnrolled = fingerprintManager.getEnrolledFingerprints(mUserId)
.size() >= fpProperties.get(0).maxTemplatesAllowed; .size() >= fpProperties.get(0).maxEnrollmentsPerUser;
if (maxFacesEnrolled) { if (maxFacesEnrolled) {
mCheckboxFace.setEnabled(false); 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 = final List<FingerprintSensorProperties> props =
mFingerprintManager.getSensorProperties(); mFingerprintManager.getSensorProperties();
// This will need to be updated for devices with multiple fingerprint sensors // 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 = final int numEnrolledFingerprints =
mFingerprintManager.getEnrolledFingerprints(mUserId).size(); mFingerprintManager.getEnrolledFingerprints(mUserId).size();
if (numEnrolledFingerprints >= max) { 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.app.KeyguardManager;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.hardware.biometrics.SensorProperties;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintSensorProperties; import android.hardware.fingerprint.FingerprintSensorProperties;
import android.view.View; import android.view.View;
@@ -74,9 +75,10 @@ public class SetupFingerprintEnrollIntroductionTest {
.setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true); .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
final FingerprintSensorProperties prop = new FingerprintSensorProperties(0 /* sensorId */, final FingerprintSensorProperties prop = new FingerprintSensorProperties(0 /* sensorId */,
SensorProperties.STRENGTH_STRONG,
5 /* maxEnrollmentsPerUser */,
FingerprintSensorProperties.TYPE_REAR, FingerprintSensorProperties.TYPE_REAR,
true /* resetLockoutRequiresHardwareAuthToken */, true /* resetLockoutRequiresHardwareAuthToken */);
5 /* maxTemplatesAllowed */);
final ArrayList<FingerprintSensorProperties> props = new ArrayList<>(); final ArrayList<FingerprintSensorProperties> props = new ArrayList<>();
props.add(prop); props.add(prop);
ShadowFingerprintManager.setSensorProperties(props); ShadowFingerprintManager.setSensorProperties(props);