Fingerprint: do not error out when stopping to listen

 * when stopListening gets called, we cancel via the cancellation signal,
   which calls the onAuthenticationError callback.

 * detect if we are canceling and do not execute the error code

 * fixes the finger print icon hiding when closing the LockPatternActivity,
   which causes the lock pattern to resize

TICKET: RM-208
Change-Id: I5bb62064f885b67836bd78af854cca950c3401fa
Signed-off-by: Alexander Martinz <eviscerationls@gmail.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/android/settings/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
index 07776f785..7c519fea5 100644
--- a/src/com/android/settings/fingerprint/FingerprintUiHelper.java
+++ b/src/com/android/settings/fingerprint/FingerprintUiHelper.java
@@ -42,6 +42,8 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
     private boolean mDark;
     private String mIdleText;
 
+    private boolean mCanceledBySelf;
+
     public FingerprintUiHelper(ImageView icon, TextView errorTextView, Callback callback) {
         mFingerprintManager = icon.getContext().getSystemService(FingerprintManager.class);
         mIcon = icon;
@@ -52,6 +54,7 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
 
     public void startListening() {
         if (mFingerprintManager.getEnrolledFingerprints().size() > 0) {
+            mCanceledBySelf = false;
             mCancellationSignal = new CancellationSignal();
             mFingerprintManager.authenticate(null, mCancellationSignal, 0 /* flags */, this, null);
             setFingerprintIconVisibility(true);
@@ -61,6 +64,7 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
     }
 
     public void stopListening() {
+        mCanceledBySelf = true;
         if (mCancellationSignal != null) {
             mCancellationSignal.cancel();
             mCancellationSignal = null;
@@ -86,8 +90,10 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
 
     @Override
     public void onAuthenticationError(int errMsgId, CharSequence errString) {
-        showError(errString);
-        setFingerprintIconVisibility(false);
+        if (!mCanceledBySelf) {
+            showError(errString);
+            setFingerprintIconVisibility(false);
+        }
     }
 
     @Override