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

Commit 002c6418 authored by Joe Bolinger's avatar Joe Bolinger Committed by Automerger Merge Worker
Browse files

Merge "Cache context for generateChallenge response." into tm-qpr-dev am: aeb042d9 am: d3b4bf7e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19662253



Change-Id: I57198e5fb8b85b1d9f7473ca92c4f9ce7afc6e7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 00ef44ec d3b4bf7e

src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java

+3 −2
Original line number Diff line number Diff line
@@ -127,13 +127,14 @@ public abstract class BiometricsSettingsBase extends DashboardFragment { 
    @Override

    public boolean onPreferenceTreeClick(Preference preference) {

        final String key = preference.getKey();

        final Context context = requireActivity().getApplicationContext();



        // Generate challenge (and request LSS to create a HAT) each time the preference is clicked,

        // since FingerprintSettings and FaceSettings revoke the challenge when finishing.

        if (getFacePreferenceKey().equals(key)) {

            mDoNotFinishActivity = true;

            mFaceManager.generateChallenge(mUserId, (sensorId, userId, challenge) -> {

                final byte[] token = BiometricUtils.requestGatekeeperHat(getActivity(), mGkPwHandle,

                final byte[] token = BiometricUtils.requestGatekeeperHat(context, mGkPwHandle,

                        mUserId, challenge);

                final Bundle extras = preference.getExtras();

                extras.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
@@ -146,7 +147,7 @@ public abstract class BiometricsSettingsBase extends DashboardFragment { 
        } else if (getFingerprintPreferenceKey().equals(key)) {

            mDoNotFinishActivity = true;

            mFingerprintManager.generateChallenge(mUserId, (sensorId, userId, challenge) -> {

                final byte[] token = BiometricUtils.requestGatekeeperHat(getActivity(), mGkPwHandle,

                final byte[] token = BiometricUtils.requestGatekeeperHat(context, mGkPwHandle,

                        mUserId, challenge);

                final Bundle extras = preference.getExtras();

                extras.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);