commit 55af42dce53fff7b4a878dde1d1ca0f752f88f9e
author Andres Morales <anmorales@google.com> Tue Apr 14 19:01:51 2015 -0700
committer Andres Morales <anmorales@google.com> Tue Apr 14 19:04:01 2015 -0700
tree 1c8bc2ea4c24095bf019bfd762a24a40c3cfb517
parent e29dae683e8334c18d1449fca3b0e27bc5ff7aaa

fingerprint settings: pass auth token to FPEnroll

Change-Id: I6e8d6d2eb5a2b5d2828af76047839ed79f804104

src/com/android/settings/FingerprintEnroll.java

diff --git a/src/com/android/settings/FingerprintEnroll.java b/src/com/android/settings/FingerprintEnroll.java
index 61bebdf..eb5d714 100644
--- a/src/com/android/settings/FingerprintEnroll.java
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -384,7 +384,11 @@
                 mContentView.findViewById(buttons[i]).setOnClickListener(this);
             }
 
-            LockPatternUtils utils = new LockPatternUtils(activity);
+            if (mToken == null) {
+                mToken = getActivity().getIntent().getByteArrayExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+            }
+
             if (mToken == null) {
                 // need to choose or confirm lock
                 updateStage(Stage.EnrollingOnboard);

src/com/android/settings/FingerprintSettings.java

diff --git a/src/com/android/settings/FingerprintSettings.java b/src/com/android/settings/FingerprintSettings.java
index 78e5ec6c..749ac11 100644
--- a/src/com/android/settings/FingerprintSettings.java
+++ b/src/com/android/settings/FingerprintSettings.java
@@ -315,6 +315,7 @@
             if (KEY_FINGERPRINT_ADD.equals(key)) {
                 Intent intent = new Intent();
                 intent.setClassName("com.android.settings", FingerprintEnroll.class.getName());
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
                 stopFingerprint();
                 startActivityForResult(intent, ADD_FINGERPRINT_REQUEST);
             } else if (pref instanceof FingerprintPreference) {