commit 408a027d4a84d99fd11c50c526e57fe73cf8c586
author Jeff Sharkey <jsharkey@android.com> Wed Apr 15 06:20:32 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 15 06:20:35 2015 +0000
tree 09fe80b0955188943fe4528ecf30f6d7874844f9
parent 9494797ef5b38dc59533f8cd8e41fb9d516de1ca
parent 7bc9235aaa6d8b68119f7635214fe9d72d4a7c42

Merge "Avoid a few crashes around unmounting."

src/com/android/settings/FingerprintEnroll.java

diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java
index 61bebdf..e56ce08 100644
--- a/src/com/android/settings/FingerprintEnroll.java
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -254,8 +254,7 @@
 
                 case EnrollingStart:
                     mEnrollmentSteps = -1;
-                    // TODO: pass in mToken
-                    mFingerprintManager.enroll(0, mEnrollmentCancel, mEnrollmentCallback, 0);
+                    mFingerprintManager.enroll(mToken, mEnrollmentCancel, mEnrollmentCallback, 0);
                     mProgressBar.setProgress(0);
                     mEnrolling = true;
                     startFingerprintAnimator(); // XXX hack - this should follow fingerprint detection