Merge "fingerprint settings: pass auth token to FPEnroll"

2015-04-15 20:50:44 +00:00
parent 8c72010cd7 55af42dce5
commit 8cb850a4cc
2 changed files with 6 additions and 1 deletions
--- a/src/com/android/settings/FingerprintEnroll.java
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -383,7 +383,11 @@ public class FingerprintEnroll extends SettingsActivity {
                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);