Merge "Don't show FP error canceled message" into pi-dev

am: 2c6ea60711

Change-Id: I3431a6be839f354ee0dc0e982162c894323271c2

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

@@ -79,6 +79,10 @@ public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallba
 
     @Override
     public void onAuthenticationError(int errMsgId, CharSequence errString) {
+        if (errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
+            // Only happens if we get preempted by another activity. Ignored.
+            return;
+        }
         showError(errString);
         setFingerprintIconVisibility(false);
     }