diff options
| author | 2017-08-30 18:19:50 +0000 | |
|---|---|---|
| committer | 2017-08-30 18:19:50 +0000 | |
| commit | a507fc4b9eef9e08a8d1ff0a948b26df8324323f (patch) | |
| tree | 092cf5436aa8a8470b8c805ded578eafc5a2a853 | |
| parent | a950087288c03b5fc2e895db31750dfb9c3cf4f8 (diff) | |
| parent | 8ad2bd4b530fda48d8cce8f087a4d7e9071d7001 (diff) | |
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev am: fb8e9b9096
am: 8ad2bd4b53
Change-Id: Ic25a7a89485ec1791befafd4933a8cdd3741ce2e
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/fingerprint/FingerprintManager.java | 7 |
4 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index c83f0989642e..341693c76efb 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15865,6 +15865,7 @@ package android.hardware.fingerprint { 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_USER_CANCELED = 10; // 0xa field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8 } diff --git a/api/system-current.txt b/api/system-current.txt index 5911101146fa..911e0c0e874f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -16619,6 +16619,7 @@ package android.hardware.fingerprint { 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_USER_CANCELED = 10; // 0xa field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8 } diff --git a/api/test-current.txt b/api/test-current.txt index dde1dc88678d..5cefb2d4287c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -15951,6 +15951,7 @@ package android.hardware.fingerprint { 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_USER_CANCELED = 10; // 0xa field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8 } diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java index 8b6f9c1bbdd2..987718a82c47 100644 --- a/core/java/android/hardware/fingerprint/FingerprintManager.java +++ b/core/java/android/hardware/fingerprint/FingerprintManager.java @@ -128,6 +128,13 @@ public class FingerprintManager { public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9; /** + * The user canceled the operation. Upon receiving this, applications should use alternate + * authentication (e.g. a password). The application should also provide the means to return + * to fingerprint authentication, such as a "use fingerprint" button. + */ + public static final int FINGERPRINT_ERROR_USER_CANCELED = 10; + + /** * @hide */ public static final int FINGERPRINT_ERROR_VENDOR_BASE = 1000; |