From aa35b8fcab6d0e6a81be7e6bf776211434c90c60 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Fri, 5 Mar 2021 18:27:22 -0800
Subject: [PATCH] Do not re-start fingerprint auth if ERROR_USER_CANCELED

Fixes: 178403701
Test: Enter fingerprint settings, swipe up
Change-Id: I0762405f01d5dfd710ad8b4c4b0e8d4a2bd13b2e
---
 .../settings/biometrics/fingerprint/FingerprintSettings.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 88920ad4a6e..1d2793ad125 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -230,7 +230,10 @@ public class FingerprintSettings extends SubSettings {
         protected void handleError(int errMsgId, CharSequence msg) {
             switch (errMsgId) {
                 case FingerprintManager.FINGERPRINT_ERROR_CANCELED:
-                    return; // Only happens if we get preempted by another activity. Ignored.
+                case FingerprintManager.FINGERPRINT_ERROR_USER_CANCELED:
+                    // Only happens if we get preempted by another activity, or canceled by the
+                    // user (e.g. swipe up to home). Ignored.
+                    return;
                 case FingerprintManager.FINGERPRINT_ERROR_LOCKOUT:
                     mInFingerprintLockout = true;
                     // We've been locked out.  Reset after 30s.