Merge "Update Settings together with generateChallenge/revokeChallenge" (74ed9014) · Commits · e / os / android_packages_apps_Settings

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
		if (mFaceManager == null) {
		return 0;
		}
		return mFaceManager.generateChallenge();
		return mFaceManager.generateChallengeBlocking();
		}

		@Override

+2 −5

Original line number	Diff line number	Diff line
		@@ -205,7 +205,7 @@ public class FaceSettings extends DashboardFragment {
		// Generate challenge in onResume instead of onCreate, since FaceSettings can be
		// created while Keyguard is showing, in which case the resetLockout revokeChallenge
		// will invalidate the too-early created challenge here.
		final long challenge = mFaceManager.generateChallenge();
		final long challenge = mFaceManager.generateChallengeBlocking();
		ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);

		mConfirmingPassword = true;
		@@ -266,10 +266,7 @@ public class FaceSettings extends DashboardFragment {
		&& !mConfirmingPassword) {
		// Revoke challenge and finish
		if (mToken != null) {
		final int result = mFaceManager.revokeChallenge();
		if (result < 0) {
		Log.w(TAG, "revokeChallenge failed, result: " + result);
		}
		mFaceManager.revokeChallenge();
		mToken = null;
		}
		finish();

+1 −4

Original line number	Diff line number	Diff line
		@@ -140,10 +140,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
		private void postEnroll() {
		final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this);
		if (fpm != null) {
		int result = fpm.postEnroll();
		if (result < 0) {
		Log.w(TAG, "postEnroll failed: result = " + result);
		}
		fpm.revokeChallenge();
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
		if (mFingerprintManager == null) {
		return 0;
		}
		return mFingerprintManager.preEnroll();
		return mFingerprintManager.generateChallengeBlocking();
		}

		@Override

+2 −5

Original line number	Diff line number	Diff line
		@@ -594,10 +594,7 @@ public class FingerprintSettings extends SubSettings {
		public void onDestroy() {
		super.onDestroy();
		if (getActivity().isFinishing()) {
		int result = mFingerprintManager.postEnroll();
		if (result < 0) {
		Log.w(TAG, "postEnroll failed: result = " + result);
		}
		mFingerprintManager.revokeChallenge();
		}
		}

		@@ -638,7 +635,7 @@ public class FingerprintSettings extends SubSettings {

		private void launchChooseOrConfirmLock() {
		Intent intent = new Intent();
		long challenge = mFingerprintManager.preEnroll();
		long challenge = mFingerprintManager.generateChallengeBlocking();
		ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
		if (!helper.launchConfirmationActivity(CONFIRM_REQUEST,
		getString(R.string.security_settings_fingerprint_preference_title),