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

* commit 'dc6bd8d2f1b2b5f28d59d00ef178e64229ab59ef':
  Ignore fp error message when not listening

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