From d14099d231fa14736aac0f2b822151b0acc4debc Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Thu, 29 Jun 2017 16:44:46 -0700 Subject: Unhide several Fingerprint APIs Test: make -j && make update-api -j && make checkbuild -j Change-Id: I2b0f42c2d69108bca3f64b431b46e093fc28976f Fixes: 38266711 --- api/current.txt | 3 +++ api/system-current.txt | 3 +++ api/test-current.txt | 3 +++ 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 40cb282cb1c1..de0403191aec 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15823,9 +15823,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 874088c3175c..3095704faf8a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16629,9 +16629,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 44df93fc4ee3..2403c91f1d6f 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -15875,9 +15875,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; -- cgit v1.2.3-59-g8ed1b