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

Commit 9ffc1917 authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Automerger Merge Worker
Browse files

Merge "Update biometric constant docs from tier to class" into rvc-dev am: 29d2bf12 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11840347

Change-Id: Ie2ffff68e4ab98267dfb00dbf5ab12331d4c402a
parents 3b4893ab 29d2bf12

core/java/android/hardware/biometrics/BiometricManager.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ public class BiometricManager { 




        /**

        /**

         * Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the

         * Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the

         * requirements for <strong>Tier 3</strong> (formerly <strong>Strong</strong>), as defined

         * requirements for <strong>Class 3</strong> (formerly <strong>Strong</strong>), as defined

         * by the Android CDD.

         * by the Android CDD.

         *

         *

         * <p>This corresponds to {@link KeyProperties#AUTH_BIOMETRIC_STRONG} during key generation.

         * <p>This corresponds to {@link KeyProperties#AUTH_BIOMETRIC_STRONG} during key generation.
@@ -132,7 +132,7 @@ public class BiometricManager { 




        /**

        /**

         * Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the

         * Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the

         * requirements for <strong>Tier 2</strong> (formerly <strong>Weak</strong>), as defined by

         * requirements for <strong>Class 2</strong> (formerly <strong>Weak</strong>), as defined by

         * the Android CDD.

         * the Android CDD.

         *

         *

         * <p>Note that this is a superset of {@link #BIOMETRIC_STRONG} and is defined such that

         * <p>Note that this is a superset of {@link #BIOMETRIC_STRONG} and is defined such that
@@ -142,7 +142,7 @@ public class BiometricManager { 




        /**

        /**

         * Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the

         * Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the

         * requirements for <strong>Tier 1</strong> (formerly <strong>Convenience</strong>), as

         * requirements for <strong>Class 1</strong> (formerly <strong>Convenience</strong>), as

         * defined by the Android CDD.

         * defined by the Android CDD.

         *

         *

         * <p>This constant is intended for use by {@link android.provider.DeviceConfig} to adjust

         * <p>This constant is intended for use by {@link android.provider.DeviceConfig} to adjust