From f1bc6e52b529de1e522e6f73512b460db28ec828 Mon Sep 17 00:00:00 2001
From: Xiyuan Xia <xiyuan@google.com>
Date: Fri, 29 May 2015 16:17:24 -0700
Subject: [PATCH] Ignore fp error message when not listening

Bug:21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
---
 .../android/settings/fingerprint/FingerprintUiHelper.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
index 66ae6946620..6ae76aad50d 100644
--- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java
+++ b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
@@ -64,6 +64,10 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
         }
     }
 
+    private boolean isListening() {
+        return mCancellationSignal != null && !mCancellationSignal.isCanceled();
+    }
+
     private void setFingerprintIconVisibility(boolean visible) {
         mIcon.setVisibility(visible ? View.VISIBLE : View.GONE);
         mCallback.onFingerprintIconVisibilityChanged(visible);
@@ -93,6 +97,10 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
     }
 
     private void showError(CharSequence error) {
+        if (!isListening()) {
+            return;
+        }
+
         vibrateFingerprintError();
         mIcon.setImageResource(R.drawable.ic_fingerprint_error);
         mErrorTextView.setText(error);