Merge "Update tier names in biometric constants documentation" into rvc-dev am: a3aac62786

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

Change-Id: Ie13ae94303443ae24f24e8c2571751fea593bef0
This commit is contained in:
TreeHugger Robot
2020-06-03 01:37:55 +00:00
committed by Automerger Merge Worker

View File

@@ -116,22 +116,25 @@ public class BiometricManager {
/**
* Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the
* requirements for <strong>Strong</strong>, as defined by the Android CDD.
* requirements for <strong>Tier 3</strong> (formerly <strong>Strong</strong>), as defined
* by the Android CDD.
*/
int BIOMETRIC_STRONG = 0x000F;
/**
* Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the
* requirements for <strong>Weak</strong>, as defined by the Android CDD.
* requirements for <strong>Tier 2</strong> (formerly <strong>Weak</strong>), as defined by
* the Android CDD.
*
* <p>Note that this is a superset of {@link #BIOMETRIC_STRONG} and is defined such that
* <code>BIOMETRIC_STRONG | BIOMETRIC_WEAK == BIOMETRIC_WEAK</code>.
* {@code BIOMETRIC_STRONG | BIOMETRIC_WEAK == BIOMETRIC_WEAK}.
*/
int BIOMETRIC_WEAK = 0x00FF;
/**
* Any biometric (e.g. fingerprint, iris, or face) on the device that meets or exceeds the
* requirements for <strong>Convenience</strong>, as defined by the Android CDD.
* requirements for <strong>Tier 1</strong> (formerly <strong>Convenience</strong>), as
* defined by the Android CDD.
*
* <p>This constant is intended for use by {@link android.provider.DeviceConfig} to adjust
* the reported strength of a biometric sensor. It is not a valid parameter for any of the