commit f1bc6e52b529de1e522e6f73512b460db28ec828
author Xiyuan Xia <xiyuan@google.com> Fri May 29 16:17:24 2015 -0700
committer Xiyuan Xia <xiyuan@google.com> Fri May 29 16:19:29 2015 -0700
tree 3a59cb3289745fa901069aa618cb2df3142fb860
parent 01f35ce46e584e0fd699c3330eba564eb6811dc5

Ignore fp error message when not listening

Bug:21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88

src/com/android/settings/fingerprint/FingerprintUiHelper.java

diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
index 66ae694..6ae76aa 100644
--- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java
+++ b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
@@ -64,6 +64,10 @@
         }
     }
 
+    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 @@
     }
 
     private void showError(CharSequence error) {
+        if (!isListening()) {
+            return;
+        }
+
         vibrateFingerprintError();
         mIcon.setImageResource(R.drawable.ic_fingerprint_error);
         mErrorTextView.setText(error);