diff options
| author | 2018-08-29 17:32:17 -0700 | |
|---|---|---|
| committer | 2018-08-30 14:49:32 -0700 | |
| commit | 15bb32d33cdc19632c6299749f7025f2e5985cb2 (patch) | |
| tree | 1ca012c0069a9c73cfe82f051a9cc6e4119ff208 | |
| parent | a24e9fd9acf0c7abbdbe40dbc2c2015d28acad49 (diff) | |
Add FEATURE_FACE and FEATURE_IRIS
Fixes: 110535333
Test: make update-api
Test: make -j
Change-Id: I64e99c1437a497a37bc7d89c9c76a4930455f767
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 4d692eee1dd3..aa1b9494d2f1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11313,6 +11313,7 @@ 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_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"; @@ -11322,6 +11323,7 @@ package android.content.pm { 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_IRIS = "android.hardware.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 7d8ff4c3d0c8..5b0e85632b90 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2274,7 +2274,6 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device has biometric hardware to perform face authentication. - * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_FACE = "android.hardware.face"; @@ -2282,7 +2281,6 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device has biometric hardware to perform iris authentication. - * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_IRIS = "android.hardware.iris"; |