summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2015-07-24 02:41:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-24 02:41:00 +0000
commitabd35bfc81ae231656c6fba67d43cfbb76f3db0d (patch)
tree0d5b4b31e3a88e825e298a83ac17320ae709de73 /core/java/android
parent7b9968538b122225bb321de9995a8f55d3de4455 (diff)
parentd9b9d41082dae0a4bbed1bdb8a62f9f7e87ec14c (diff)
Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/PackageManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 6533bbcc6299..cda581612282 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1514,6 +1514,13 @@ public abstract class PackageManager {
/**
* 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.fingerprint";
+
+ /**
+ * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device supports portrait orientation
* screens. For backwards compatibility, you can assume that if neither
* this nor {@link #FEATURE_SCREEN_LANDSCAPE} is set then the device supports