diff options
| author | 2017-07-19 19:02:19 +0000 | |
|---|---|---|
| committer | 2017-07-19 19:02:19 +0000 | |
| commit | 9fa81d232da0c322a2b813b548e686d045a3a0b3 (patch) | |
| tree | 304f40658c4b2e4fd8c59a9c99497f0403ccc36b | |
| parent | b0bcf793a53ec0b3900d212874bfd9b6a2b956f2 (diff) | |
| parent | d14099d231fa14736aac0f2b822151b0acc4debc (diff) | |
Merge "Unhide several Fingerprint APIs"
| -rw-r--r-- | api/current.txt | 3 | ||||
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | api/test-current.txt | 3 | ||||
| -rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintManager.java | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index b1d93918b867..65935aee6657 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15851,9 +15851,12 @@ package android.hardware.fingerprint { field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5 field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1 field public static final int FINGERPRINT_ERROR_LOCKOUT = 7; // 0x7 + field public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9; // 0x9 field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4 field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3 field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2 + field public static final int FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6; // 0x6 + field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8 } public static abstract class FingerprintManager.AuthenticationCallback { diff --git a/api/system-current.txt b/api/system-current.txt index 8db0b9f6e6ab..9e4bad8ccd91 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16663,9 +16663,12 @@ package android.hardware.fingerprint { field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5 field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1 field public static final int FINGERPRINT_ERROR_LOCKOUT = 7; // 0x7 + field public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9; // 0x9 field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4 field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3 field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2 + field public static final int FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6; // 0x6 + field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8 } public static abstract class FingerprintManager.AuthenticationCallback { diff --git a/api/test-current.txt b/api/test-current.txt index da4f678646ed..f08936247926 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -15904,9 +15904,12 @@ package android.hardware.fingerprint { field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5 field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1 field public static final int FINGERPRINT_ERROR_LOCKOUT = 7; // 0x7 + field public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9; // 0x9 field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4 field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3 field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2 + field public static final int FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6; // 0x6 + field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8 } public static abstract class FingerprintManager.AuthenticationCallback { diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index b51a7919e3bf..5030865b2551 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -99,8 +99,6 @@ public class FingerprintManager { /** * The {@link FingerprintManager#remove} call failed. Typically this will happen when the * provided fingerprint id was incorrect. - * - * @hide */ public static final int FINGERPRINT_ERROR_UNABLE_TO_REMOVE = 6; @@ -112,7 +110,6 @@ public class FingerprintManager { /** * Hardware vendors may extend this list if there are conditions that do not fall under one of * the above categories. Vendors are responsible for providing error strings for these errors. - * @hide */ public static final int FINGERPRINT_ERROR_VENDOR = 8; @@ -120,7 +117,6 @@ public class FingerprintManager { * The operation was canceled because FINGERPRINT_ERROR_LOCKOUT occurred too many times. * Fingerprint authentication is disabled until the user unlocks with strong authentication * (PIN/Pattern/Password) - * @hide */ public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9; |