Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cb850a4 authored by Andres Morales's avatar Andres Morales Committed by Android (Google) Code Review
Browse files

Merge "fingerprint settings: pass auth token to FPEnroll"

parents 8c72010c 55af42dc

src/com/android/settings/FingerprintEnroll.java

+5 −1
Original line number Diff line number Diff line
@@ -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);

src/com/android/settings/FingerprintSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ public class FingerprintSettings extends SettingsActivity { 
            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) {