Merge "Allows user to skip fingerprint during setup" (dbc5ce1e) · Commits · e / os / android_packages_apps_Settings

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

+11 −6

Original line number	Diff line number	Diff line
		@@ -103,19 +103,24 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {

		@Override
		protected void onActivityResult(int requestCode, int resultCode, Intent data) {
		if (resultCode == RESULT_FINISHED) {
		final boolean isResultFinished = resultCode == RESULT_FINISHED;
		if (requestCode == FINGERPRINT_FIND_SENSOR_REQUEST) {
		setResult(RESULT_OK);
		if (isResultFinished \|\| resultCode == RESULT_SKIP) {
		final int result = isResultFinished ? RESULT_OK : RESULT_SKIP;
		setResult(result);
		finish();
		return;
		}
		} else if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
		if (isResultFinished) {
		updatePasswordQuality();
		byte[] token = data.getByteArrayExtra(
		ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
		launchFindSensor(token);
		return;
		}
		} else {
		super.onActivityResult(requestCode, resultCode, data);
		}
		super.onActivityResult(requestCode, resultCode, data);
		}

		@Override