diff options
| author | Jim Miller <jaggies@google.com> | 2015-02-27 21:51:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-27 21:51:27 +0000 |
| commit | c5ff04cbc4da6abc2ca5d746fb4c96fff7b64c34 (patch) | |
| tree | 508ac7827ac4d2a2cc17faa9e0791847b21842ba /api | |
| parent | 9618c6eee82eb5087f5c84899fe4652253dc95f5 (diff) | |
| parent | ba67aee02cf864793129976cd8a8a46e60c60577 (diff) | |
| download | frameworks_base-c5ff04cbc4da6abc2ca5d746fb4c96fff7b64c34.zip frameworks_base-c5ff04cbc4da6abc2ca5d746fb4c96fff7b64c34.tar.gz frameworks_base-c5ff04cbc4da6abc2ca5d746fb4c96fff7b64c34.tar.bz2 | |
Merge "Add fingerprint settings support to the framework"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index e92e9f4..80ca6cc 100644 --- a/api/current.txt +++ b/api/current.txt @@ -141,6 +141,7 @@ package android { field public static final java.lang.String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT"; field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS"; field public static final java.lang.String USE_CREDENTIALS = "android.permission.USE_CREDENTIALS"; + field public static final java.lang.String USE_FINGERPRINT = "android.permission.USE_FINGERPRINT"; field public static final java.lang.String USE_SIP = "android.permission.USE_SIP"; field public static final java.lang.String VIBRATE = "android.permission.VIBRATE"; field public static final java.lang.String WAKE_LOCK = "android.permission.WAKE_LOCK"; diff --git a/api/system-current.txt b/api/system-current.txt index 29ebf57..8ec0bb0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -210,6 +210,7 @@ package android { field public static final java.lang.String UPDATE_LOCK = "android.permission.UPDATE_LOCK"; field public static final java.lang.String USER_ACTIVITY = "android.permission.USER_ACTIVITY"; field public static final java.lang.String USE_CREDENTIALS = "android.permission.USE_CREDENTIALS"; + field public static final java.lang.String USE_FINGERPRINT = "android.permission.USE_FINGERPRINT"; field public static final java.lang.String USE_SIP = "android.permission.USE_SIP"; field public static final java.lang.String VIBRATE = "android.permission.VIBRATE"; field public static final java.lang.String WAKE_LOCK = "android.permission.WAKE_LOCK"; |