Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a65c11d0 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Don't delay the FINGERPRINT_ERROR_CANCELED message" into pi-dev am: 54926ba6 

am: 8566a544

Change-Id: I881dcdd4a1da08173e74f5b831c716decf21c752
parents 951a9700 8566a544

core/java/android/hardware/fingerprint/FingerprintManager.java

+4 −2
Original line number Diff line number Diff line
@@ -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);

                    });