diff options
| author | Jim Miller <jaggies@google.com> | 2015-07-22 19:51:40 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2015-07-22 19:54:15 -0700 |
| commit | d9b9d41082dae0a4bbed1bdb8a62f9f7e87ec14c (patch) | |
| tree | 21ba5d852e045ca89a2db3d297621ba25ba081ca | |
| parent | 091f0e5c6c7f9e72a6e661c4849a2e232823075b (diff) | |
| download | frameworks_base-d9b9d41082dae0a4bbed1bdb8a62f9f7e87ec14c.zip frameworks_base-d9b9d41082dae0a4bbed1bdb8a62f9f7e87ec14c.tar.gz frameworks_base-d9b9d41082dae0a4bbed1bdb8a62f9f7e87ec14c.tar.bz2 | |
Add FEATURE_FINGERPRINT to PackageManager's feature list
Fixes bug 22674557
Change-Id: I3d78e6bedc3ac18a25a06ac50e3a7eee4161fe70
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 7 |
3 files changed, 11 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index a129a63..3849e8a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9313,6 +9313,7 @@ package android.content.pm { 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_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"; @@ -28825,11 +28826,11 @@ package android.service.voice { method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent); method public void onHandleScreenshot(android.graphics.Bitmap); method public void onHide(); - method public void onLockscreenShown(); method public boolean onKeyDown(int, android.view.KeyEvent); method public boolean onKeyLongPress(int, android.view.KeyEvent); method public boolean onKeyMultiple(int, int, android.view.KeyEvent); method public boolean onKeyUp(int, android.view.KeyEvent); + method public void onLockscreenShown(); method public void onLowMemory(); method public void onRequestAbortVoice(android.service.voice.VoiceInteractionSession.AbortVoiceRequest); method public void onRequestCommand(android.service.voice.VoiceInteractionSession.CommandRequest); diff --git a/api/system-current.txt b/api/system-current.txt index c2fd0d1..4586cd5 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9607,6 +9607,7 @@ package android.content.pm { 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_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"; @@ -30977,11 +30978,11 @@ package android.service.voice { method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent); method public void onHandleScreenshot(android.graphics.Bitmap); method public void onHide(); - method public void onLockscreenShown(); method public boolean onKeyDown(int, android.view.KeyEvent); method public boolean onKeyLongPress(int, android.view.KeyEvent); method public boolean onKeyMultiple(int, int, android.view.KeyEvent); method public boolean onKeyUp(int, android.view.KeyEvent); + method public void onLockscreenShown(); method public void onLowMemory(); method public void onRequestAbortVoice(android.service.voice.VoiceInteractionSession.AbortVoiceRequest); method public void onRequestCommand(android.service.voice.VoiceInteractionSession.CommandRequest); diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 6533bbc..cda5816 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 |