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

Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev

Browse Source
This commit is contained in:
Kevin Chyn
2018-04-18 01:53:39 +00:00
committed by Android (Google) Code Review
parent 4ea0a5a2df 58a0d51472
commit 54926ba6a9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1159,8 +1159,10 @@ public class FingerprintManager implements BiometricFingerprintConstants {
public void onError(long deviceId, int error, int vendorCode) {
if (mExecutor != null) {
// BiometricPrompt case
if (error == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED) {
// User tapped somewhere to cancel, the biometric dialog is already dismissed.
if (error == FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED
|| error == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
// User tapped somewhere to cancel, or authentication was cancelled by the app
// or got kicked out. The prompt is already gone, so send the error immediately.
mExecutor.execute(() -> {
sendErrorResult(deviceId, error, vendorCode);
});