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

Commit 39b2fe8b authored by Kevin Chyn's avatar Kevin Chyn
Browse files

Update fingerprint revokeChallenge with frameworks/base 

Bug: 181977689
Test: manual
Change-Id: I92e6dae58d67f1355c6d0ba3bbf95ff2ad5247ed
parent e91e39b6

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

+4 −2
Original line number Diff line number Diff line
@@ -100,14 +100,14 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        mChallenge = getIntent().getLongExtra(EXTRA_KEY_CHALLENGE, -1L);

        mSensorId = getIntent().getIntExtra(EXTRA_KEY_SENSOR_ID, -1);

        // Don't need to retrieve the HAT if it already exists. In some cases, the extras do not

        // contain EXTRA_KEY_CHALLENGE_TOKEN but contain EXTRA_KEY_GK_PW, in which case enrollment

        // classes may request a HAT to be created (as opposed to being passed in)

        if (mToken == null) {

            mToken = getIntent().getByteArrayExtra(

                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);

            mChallenge = getIntent().getLongExtra(EXTRA_KEY_CHALLENGE, 0L);

            mSensorId = getIntent().getIntExtra(EXTRA_KEY_SENSOR_ID, -1);

        }

        mFromSettingsSummary = getIntent().getBooleanExtra(EXTRA_FROM_SETTINGS_SUMMARY, false);

        if (savedInstanceState != null && mToken == null) {
@@ -202,6 +202,8 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { 
        intent.setClassName(SETTINGS_PACKAGE_NAME, FingerprintEnrollEnrolling.class.getName());

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);

        intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);

        intent.putExtra(EXTRA_KEY_CHALLENGE, mChallenge);

        intent.putExtra(EXTRA_KEY_SENSOR_ID, mSensorId);

        if (mUserId != UserHandle.USER_NULL) {

            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

        }

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

+2 −0
Original line number Diff line number Diff line
@@ -121,6 +121,8 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase 
                | Intent.FLAG_ACTIVITY_CLEAR_TOP

                | Intent.FLAG_ACTIVITY_SINGLE_TOP);

        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);

        intent.putExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, mSensorId);

        intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, mChallenge);

        intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);

        if (mUserId != UserHandle.USER_NULL) {

            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

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

+2 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ public class MultiBiometricEnrollHelper { 
                    mGkPwHandle, mUserId, challenge);

            final Intent intent = BiometricUtils.getFingerprintIntroIntent(mActivity,

                    mActivity.getIntent());

            intent.putExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);

            intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);

            BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,

                    hardwareAuthToken, mGkPwHandle, mUserId);

        }));

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

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase { 
        if (mToken == null && BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {

            final FingerprintManager fpm = getSystemService(FingerprintManager.class);

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

                mChallenge = challenge;

                mSensorId = sensorId;

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

                BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());

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

+2 −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(mUserId);

            fpm.revokeChallenge(mUserId, mChallenge);

        }

    }
@@ -150,6 +150,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase { 
        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);

        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);

        intent.putExtra(Intent.EXTRA_USER_ID, mUserId);

        intent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, mChallenge);

        startActivity(intent);

    }