Merge "Make face education handle timeout result correctly" into sc-dev (4cb6d12b) · Commits · e / os / android_packages_apps_Settings

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -226,7 +226,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
	protected void onActivityResult(int requestCode, int resultCode, Intent data) {		protected void onActivityResult(int requestCode, int resultCode, Intent data) {
	super.onActivityResult(requestCode, resultCode, data);		super.onActivityResult(requestCode, resultCode, data);
	mResultIntent = data;		mResultIntent = data;
	if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST		if (resultCode == RESULT_TIMEOUT) {
			setResult(resultCode, data);
			finish();
			} else if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST
	\|\| requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {		\|\| requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {
	// If the user finished or skipped enrollment, finish this activity		// If the user finished or skipped enrollment, finish this activity
	if (resultCode == RESULT_SKIP \|\| resultCode == RESULT_FINISHED		if (resultCode == RESULT_SKIP \|\| resultCode == RESULT_FINISHED
	@@ -234,9 +237,6 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
	setResult(resultCode, data);		setResult(resultCode, data);
	finish();		finish();
	}		}
	} else if (resultCode == RESULT_TIMEOUT) {
	setResult(resultCode, data);
	finish();
	}		}
	}		}