diff options
| author | 2018-12-18 02:01:45 +0000 | |
|---|---|---|
| committer | 2018-12-18 02:01:45 +0000 | |
| commit | 2ae0e21c348864142a6a8f5bd76f4adb16eb67da (patch) | |
| tree | ae9623a2a32db78ae0023904f1c9b795264653cc | |
| parent | dd54e67f70de7b6c186053650487bc96775dfc1a (diff) | |
| parent | 5c5603d1e0d859642acaba43e98192fd006410fc (diff) | |
Merge "Move biometrics into biometric namespace"
| -rw-r--r-- | api/current.txt | 7 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 13 |
2 files changed, 14 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index da888d7a3c02..913884368334 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11565,18 +11565,19 @@ package android.content.pm { field public static final java.lang.String FEATURE_DEVICE_ADMIN = "android.software.device_admin"; field public static final java.lang.String FEATURE_EMBEDDED = "android.hardware.type.embedded"; field public static final java.lang.String FEATURE_ETHERNET = "android.hardware.ethernet"; - field public static final java.lang.String FEATURE_FACE = "android.hardware.face"; + field public static final java.lang.String FEATURE_FACE = "android.hardware.biometrics.face"; field public static final java.lang.String FEATURE_FAKETOUCH = "android.hardware.faketouch"; field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct"; field public static final java.lang.String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand"; - field public static final java.lang.String FEATURE_FINGERPRINT = "android.hardware.fingerprint"; + field public static final java.lang.String FEATURE_FINGERPRINT = "android.hardware.biometrics.fingerprint"; + field public static final java.lang.String FEATURE_FINGERPRINT_PRE_29 = "android.hardware.fingerprint"; field public static final java.lang.String FEATURE_FREEFORM_WINDOW_MANAGEMENT = "android.software.freeform_window_management"; field public static final java.lang.String FEATURE_GAMEPAD = "android.hardware.gamepad"; field public static final java.lang.String FEATURE_HIFI_SENSORS = "android.hardware.sensor.hifi_sensors"; field public static final java.lang.String FEATURE_HOME_SCREEN = "android.software.home_screen"; field public static final java.lang.String FEATURE_INPUT_METHODS = "android.software.input_methods"; field public static final java.lang.String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels"; - field public static final java.lang.String FEATURE_IRIS = "android.hardware.iris"; + field public static final java.lang.String FEATURE_IRIS = "android.hardware.biometrics.iris"; field public static final java.lang.String FEATURE_LEANBACK = "android.software.leanback"; field public static final java.lang.String FEATURE_LEANBACK_ONLY = "android.software.leanback_only"; field public static final java.lang.String FEATURE_LIVE_TV = "android.software.live_tv"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 566017b7372e..9d604bbd75aa 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2288,21 +2288,28 @@ public abstract class PackageManager { * {@link #hasSystemFeature}: The device has biometric hardware to detect a fingerprint. */ @SdkConstant(SdkConstantType.FEATURE) - public static final String FEATURE_FINGERPRINT = "android.hardware.fingerprint"; + public static final String FEATURE_FINGERPRINT_PRE_29 = "android.hardware.fingerprint"; + + /** + * Feature for {@link #getSystemAvailableFeatures} and + * {@link #hasSystemFeature}: The device has biometric hardware to detect a fingerprint. + */ + @SdkConstant(SdkConstantType.FEATURE) + public static final String FEATURE_FINGERPRINT = "android.hardware.biometrics.fingerprint"; /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device has biometric hardware to perform face authentication. */ @SdkConstant(SdkConstantType.FEATURE) - public static final String FEATURE_FACE = "android.hardware.face"; + public static final String FEATURE_FACE = "android.hardware.biometrics.face"; /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device has biometric hardware to perform iris authentication. */ @SdkConstant(SdkConstantType.FEATURE) - public static final String FEATURE_IRIS = "android.hardware.iris"; + public static final String FEATURE_IRIS = "android.hardware.biometrics.iris"; /** * Feature for {@link #getSystemAvailableFeatures} and |