Update revokeChallenge together with frameworks/base (e91e39b6) · Commits · e / os / android_packages_apps_Settings

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,8 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
		public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";
		public static final String EXTRA_KEY_REQUIRE_VISION = "accessibility_vision";
		public static final String EXTRA_KEY_REQUIRE_DIVERSITY = "accessibility_diversity";
		public static final String EXTRA_KEY_SENSOR_ID = "sensor_id";
		public static final String EXTRA_KEY_CHALLENGE = "challenge";

		/**
		* Used by the choose fingerprint wizard to indicate the wizard is
		@@ -90,6 +92,8 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
		protected boolean mLaunchedConfirmLock;
		protected byte[] mToken;
		protected int mUserId;
		protected int mSensorId;
		protected long mChallenge;
		protected boolean mFromSettingsSummary;
		protected FooterBarMixin mFooterBarMixin;

		@@ -102,6 +106,8 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
		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) {
		@@ -110,6 +116,8 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
		ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
		mFromSettingsSummary =
		savedInstanceState.getBoolean(EXTRA_FROM_SETTINGS_SUMMARY, false);
		mChallenge = savedInstanceState.getLong(EXTRA_KEY_CHALLENGE);
		mSensorId = savedInstanceState.getInt(EXTRA_KEY_SENSOR_ID);
		}
		mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
		}
		@@ -127,6 +135,8 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
		outState.putBoolean(EXTRA_KEY_LAUNCHED_CONFIRM, mLaunchedConfirmLock);
		outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
		outState.putBoolean(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
		outState.putLong(EXTRA_KEY_CHALLENGE, mChallenge);
		outState.putInt(EXTRA_KEY_SENSOR_ID, mSensorId);
		}

		@Override

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,8 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
		}
		BiometricUtils.copyMultiBiometricExtras(getIntent(), intent);
		intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
		intent.putExtra(EXTRA_KEY_CHALLENGE, mChallenge);
		intent.putExtra(EXTRA_KEY_SENSOR_ID, mSensorId);
		startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
		}

		@@ -262,6 +264,8 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
		overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
		getNextButton().setEnabled(false);
		getChallenge(((sensorId, challenge) -> {
		mSensorId = sensorId;
		mChallenge = challenge;
		mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
		BiometricUtils.removeGatekeeperPasswordHandle(this, data);
		getNextButton().setEnabled(true);
		@@ -276,6 +280,8 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
		overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
		getNextButton().setEnabled(false);
		getChallenge(((sensorId, challenge) -> {
		mSensorId = sensorId;
		mChallenge = challenge;
		mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
		BiometricUtils.removeGatekeeperPasswordHandle(this, data);
		getNextButton().setEnabled(true);

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,8 @@ public class MultiBiometricEnrollHelper {
		mGkPwHandle, mUserId, challenge);
		final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity,
		mActivity.getIntent());
		faceIntent.putExtra(BiometricEnrollBase.EXTRA_KEY_SENSOR_ID, sensorId);
		faceIntent.putExtra(BiometricEnrollBase.EXTRA_KEY_CHALLENGE, challenge);

		if (mRequestEnrollFingerprint) {
		// Give FaceEnroll a pendingIntent pointing to fingerprint enrollment, so that it

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -183,6 +183,8 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
		if (mUserId != UserHandle.USER_NULL) {
		intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
		}
		intent.putExtra(EXTRA_KEY_CHALLENGE, mChallenge);
		intent.putExtra(EXTRA_KEY_SENSOR_ID, mSensorId);
		intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
		BiometricUtils.copyMultiBiometricExtras(getIntent(), intent);
		final String flattenedString = getString(R.string.config_face_enroll);

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,8 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
		// the challenge is ready. Let's just do this for now.
		mFaceManager.generateChallenge((sensorId, challenge) -> {
		mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
		mSensorId = sensorId;
		mChallenge = challenge;
		if (BiometricUtils.isMultiBiometricEnrollmentFlow(this)) {
		BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());
		}