Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9096f094 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Update settings together with frameworks/base"

parents 1fa6f330 8d63b982

src/com/android/settings/biometrics/BiometricEnrollActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {

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

+4 −2
Original line number Diff line number Diff line
@@ -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);