commit dc6bd8d2f1b2b5f28d59d00ef178e64229ab59ef
author Xiyuan Xia <xiyuan@google.com> Sat May 30 03:28:49 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 30 03:28:52 2015 +0000
tree 3e73f8aa5f8a4a845ead2972e928f0fdd748b483
parent 097936ad1b6632787127cbefe38373e9696e377d
parent f1bc6e52b529de1e522e6f73512b460db28ec828

Merge "Ignore fp error message when not listening" into mnc-dev

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);