diff options
| author | Jim Miller <jaggies@google.com> | 2015-07-24 02:41:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-24 02:41:00 +0000 |
| commit | abd35bfc81ae231656c6fba67d43cfbb76f3db0d (patch) | |
| tree | 0d5b4b31e3a88e825e298a83ac17320ae709de73 /api | |
| parent | 7b9968538b122225bb321de9995a8f55d3de4455 (diff) | |
| parent | d9b9d41082dae0a4bbed1bdb8a62f9f7e87ec14c (diff) | |
| download | frameworks_base-abd35bfc81ae231656c6fba67d43cfbb76f3db0d.zip frameworks_base-abd35bfc81ae231656c6fba67d43cfbb76f3db0d.tar.gz frameworks_base-abd35bfc81ae231656c6fba67d43cfbb76f3db0d.tar.bz2 | |
Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 462ca0a..7c5115f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9314,6 +9314,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"; @@ -28827,11 +28828,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 d6e3c03..a08a011 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9608,6 +9608,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"; @@ -30979,11 +30980,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); |