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

Commit 9ce9d3d5 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Update biometric onChallengeGenerated with frameworks/base 

Bug: 145978626
Test: Builds

Change-Id: If02497fa6462f1ff263aeb96cf0beed014fee328
parent 9af90d3c

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

+3 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
    public abstract void onClick(LinkSpan span);



    protected interface GenerateChallengeCallback {

        void onChallengeGenerated(long challenge);

        void onChallengeGenerated(int sensorId, long challenge);

    }



    @Override
@@ -276,7 +276,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
                updatePasswordQuality();

                overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);

                getNextButton().setEnabled(false);

                getChallenge((challenge -> {

                getChallenge(((sensorId, challenge) -> {

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

                    getNextButton().setEnabled(true);

                }));
@@ -289,7 +289,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
            if (resultCode == RESULT_OK && data != null) {

                overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);

                getNextButton().setEnabled(false);

                getChallenge((challenge -> {

                getChallenge(((sensorId, challenge) -> {

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

                    getNextButton().setEnabled(true);

                }));

src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { 
            mFooterBarMixin.getPrimaryButton().setEnabled(false);

            // We either block on generateChallenge, or need to gray out the "next" button until

            // the challenge is ready. Let's just do this for now.

            mFaceManager.generateChallenge(challenge -> {

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

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

                mFooterBarMixin.getPrimaryButton().setEnabled(true);

            });
@@ -185,7 +185,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { 
    protected void getChallenge(GenerateChallengeCallback callback) {

        mFaceManager = Utils.getFaceManagerOrNull(this);

        if (mFaceManager == null) {

            callback.onChallengeGenerated(0L);

            callback.onChallengeGenerated(0, 0L);

            return;

        }

        mFaceManager.generateChallenge(callback::onChallengeGenerated);

src/com/android/settings/biometrics/face/FaceSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ public class FaceSettings extends DashboardFragment { 
        if (requestCode == CONFIRM_REQUEST) {

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

                // The pin/pattern/password was set.

                mFaceManager.generateChallenge(challenge -> {

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

                    mToken = BiometricUtils.requestGatekeeperHat(getPrefContext(), data, mUserId,

                            challenge);

                    mAttentionController.setToken(mToken);

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.containsGatekeeperPassword(getIntent())) {

            final FingerprintManager fpm = getSystemService(FingerprintManager.class);

            fpm.generateChallenge(challenge -> {

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

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



                // Put this into the intent. This is really just to work around the fact that the

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

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { 
    protected void getChallenge(GenerateChallengeCallback callback) {

        mFingerprintManager = Utils.getFingerprintManagerOrNull(this);

        if (mFingerprintManager == null) {

            callback.onChallengeGenerated(0L);

            callback.onChallengeGenerated(0, 0L);

            return;

        }

        mFingerprintManager.generateChallenge(callback::onChallengeGenerated);