From 7319214db94702d51f110190c8b8a8a8ef98ca92 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Mon, 26 Mar 2018 12:38:21 -0700
Subject: [PATCH] Don't show FP error canceled message

Test: manual test of SUW, error message doesn't show up when
      confirm credentials is complete

Change-Id: Ie0750629dcd5bb5d84df08c75e9c83384c299073
Fixes: 76400618
---
 src/com/android/settings/fingerprint/FingerprintUiHelper.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
index 655ce2682f5..4a67ecd5c0b 100644
--- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java
+++ b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
@@ -79,6 +79,10 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
 
     @Override
     public void onAuthenticationError(int errMsgId, CharSequence errString) {
+        if (errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
+            // Only happens if we get preempted by another activity. Ignored.
+            return;
+        }
         showError(errString);
         setFingerprintIconVisibility(false);
     }