Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-30 17:47:46 +00:00
committed by Android (Google) Code Review
parent f4a484064b a8bc97cd70
commit fb8e9b9096
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -15863,6 +15863,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
}

1
api/system-current.txt
View File

@@ -16614,6 +16614,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
}

1
api/test-current.txt
View File

@@ -15949,6 +15949,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
}

7
core/java/android/hardware/fingerprint/FingerprintManager.java
View File

@@ -127,6 +127,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
*/