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

Commit 252a9595 authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Android (Google) Code Review
Browse files

Merge "Update generateChallenge/revokeChallenge w/ frameworks/base"

parents 0a270aba af7837f6

src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ public class MultiBiometricEnrollHelper { 
    private void launchFingerprintEnroll() {

        final FingerprintManager fingerprintManager = mActivity

                .getSystemService(FingerprintManager.class);

        fingerprintManager.generateChallenge(((sensorId, challenge) -> {

        fingerprintManager.generateChallenge(mUserId, ((sensorId, challenge) -> {

            final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity,

                    mGkPwHandle, mUserId, challenge);

            final Intent intent = BiometricUtils.getFingerprintIntroIntent(mActivity,

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase { 
        // adb shell am start -a android.app.action.SET_NEW_PASSWORD

        if (mToken == null && BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {

            final FingerprintManager fpm = getSystemService(FingerprintManager.class);

            fpm.generateChallenge((sensorId, challenge) -> {

            fpm.generateChallenge(mUserId, (sensorId, challenge) -> {

                mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);

                BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { 
    private void postEnroll() {

        final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this);

        if (fpm != null) {

            fpm.revokeChallenge();

            fpm.revokeChallenge(mUserId);

        }

    }

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { 
            callback.onChallengeGenerated(0, 0L);

            return;

        }

        mFingerprintManager.generateChallenge(callback::onChallengeGenerated);

        mFingerprintManager.generateChallenge(mUserId, callback::onChallengeGenerated);

    }



    @Override

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -571,7 +571,7 @@ public class FingerprintSettings extends SubSettings { 
                mLaunchedConfirm = false;

                if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {

                    if (data != null && BiometricUtils.containsGatekeeperPasswordHandle(data)) {

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

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

                            mToken = BiometricUtils.requestGatekeeperHat(getActivity(), data,

                                    mUserId, challenge);

                            BiometricUtils.removeGatekeeperPasswordHandle(getActivity(), data);
@@ -599,7 +599,7 @@ public class FingerprintSettings extends SubSettings { 
        public void onDestroy() {

            super.onDestroy();

            if (getActivity().isFinishing()) {

                mFingerprintManager.revokeChallenge();

                mFingerprintManager.revokeChallenge(mUserId);

            }

        }