From 587bd62dff4c53df02714ae519070d79d49a56ab Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Mon, 28 Sep 2020 10:02:13 -0700 Subject: [PATCH] Update settings together with frameworks/base Bug: 169459906 Test: Builds Exempt-From-Owner-Approval: Name change Change-Id: I453d743fe29c33776a784942863dcba19c67c26a --- .../biometrics/BiometricEnrollActivity.java | 13 +++++++------ .../biometrics/face/FaceEnrollIntroduction.java | 11 ++++------- .../fingerprint/FingerprintEnrollIntroduction.java | 6 +++--- .../SetupFingerprintEnrollIntroductionTest.java | 6 ++++-- .../testutils/shadow/ShadowFingerprintManager.java | 9 ++++----- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java index bfdcd5b47be..791efa713e4 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java +++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java @@ -25,9 +25,9 @@ import android.content.res.Resources; import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.BiometricManager.Authenticators; import android.hardware.face.FaceManager; -import android.hardware.face.FaceSensorProperties; +import android.hardware.face.FaceSensorPropertiesInternal; import android.hardware.fingerprint.FingerprintManager; -import android.hardware.fingerprint.FingerprintSensorProperties; +import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; @@ -233,13 +233,14 @@ public class BiometricEnrollActivity extends InstrumentedActivity { final FingerprintManager fingerprintManager = getSystemService(FingerprintManager.class); final FaceManager faceManager = getSystemService(FaceManager.class); - final List fpProperties = - fingerprintManager.getSensorProperties(); - final List faceProperties = faceManager.getSensorProperties(); + final List fpProperties = + fingerprintManager.getSensorPropertiesInternal(); + final List faceProperties = + faceManager.getSensorPropertiesInternal(); // This would need to be updated for devices with multiple sensors of the same modality final boolean maxFacesEnrolled = faceManager.getEnrolledFaces(mUserId).size() - >= faceProperties.get(0).maxTemplatesAllowed; + >= faceProperties.get(0).maxEnrollmentsPerUser; final boolean maxFingerprintsEnrolled = fingerprintManager.getEnrolledFingerprints(mUserId) .size() >= fpProperties.get(0).maxEnrollmentsPerUser; diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index 55a56ed6a7e..3bffbbf9cbf 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -16,15 +16,12 @@ package com.android.settings.biometrics.face; -import android.app.PendingIntent; import android.app.admin.DevicePolicyManager; import android.app.settings.SettingsEnums; import android.content.Intent; -import android.content.IntentSender; import android.hardware.face.FaceManager; -import android.hardware.face.FaceSensorProperties; +import android.hardware.face.FaceSensorPropertiesInternal; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.widget.TextView; @@ -32,7 +29,6 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.biometrics.BiometricEnrollIntroduction; import com.android.settings.biometrics.BiometricUtils; -import com.android.settings.biometrics.MultiBiometricEnrollHelper; import com.android.settings.overlay.FeatureFactory; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.RestrictedLockUtilsInternal; @@ -173,9 +169,10 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { private boolean maxFacesEnrolled() { if (mFaceManager != null) { - final List props = mFaceManager.getSensorProperties(); + final List props = + mFaceManager.getSensorPropertiesInternal(); // This will need to be updated for devices with multiple face sensors. - final int max = props.get(0).maxTemplatesAllowed; + final int max = props.get(0).maxEnrollmentsPerUser; final int numEnrolledFaces = mFaceManager.getEnrolledFaces(mUserId).size(); return numEnrolledFaces >= max; } else { diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java index 61c837acc51..f5dc0e6f695 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java @@ -21,7 +21,7 @@ import android.app.settings.SettingsEnums; import android.content.ActivityNotFoundException; import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; -import android.hardware.fingerprint.FingerprintSensorProperties; +import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.os.Bundle; import android.util.Log; import android.widget.TextView; @@ -126,8 +126,8 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { @Override protected int checkMaxEnrolled() { if (mFingerprintManager != null) { - final List props = - mFingerprintManager.getSensorProperties(); + final List props = + mFingerprintManager.getSensorPropertiesInternal(); // This will need to be updated for devices with multiple fingerprint sensors final int max = props.get(0).maxEnrollmentsPerUser; final int numEnrolledFingerprints = 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 794560cc02b..2e7023656f7 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -26,6 +26,7 @@ import android.content.pm.PackageManager; import android.hardware.biometrics.SensorProperties; import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintSensorProperties; +import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import android.view.View; import android.widget.Button; @@ -74,12 +75,13 @@ public class SetupFingerprintEnrollIntroductionTest { Shadows.shadowOf(application.getPackageManager()) .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true); - final FingerprintSensorProperties prop = new FingerprintSensorProperties(0 /* sensorId */, + final FingerprintSensorPropertiesInternal prop = new FingerprintSensorPropertiesInternal( + 0 /* sensorId */, SensorProperties.STRENGTH_STRONG, 5 /* maxEnrollmentsPerUser */, FingerprintSensorProperties.TYPE_REAR, true /* resetLockoutRequiresHardwareAuthToken */); - final ArrayList props = new ArrayList<>(); + final ArrayList props = new ArrayList<>(); props.add(prop); ShadowFingerprintManager.setSensorProperties(props); diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java index da2d590414c..e118a8986dd 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java @@ -18,20 +18,19 @@ package com.android.settings.testutils.shadow; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; -import android.hardware.fingerprint.FingerprintSensorProperties; +import android.hardware.fingerprint.FingerprintSensorPropertiesInternal; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import java.util.ArrayList; import java.util.List; @Implements(FingerprintManager.class) public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFingerprintManager { - private static List sFingerprintSensorProperties; + private static List sFingerprintSensorProperties; - public static void setSensorProperties(List props) { + public static void setSensorProperties(List props) { sFingerprintSensorProperties = props; } @@ -41,7 +40,7 @@ public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFing } @Implementation - protected List getSensorProperties() { + protected List getSensorPropertiesInternal() { return sFingerprintSensorProperties; } }