Merge "Make face education handle timeout result correctly" into sc-dev
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 08cf5ff..fa8f556 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -226,7 +226,10 @@
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, 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) {
// If the user finished or skipped enrollment, finish this activity
if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED
@@ -234,9 +237,6 @@
setResult(resultCode, data);
finish();
}
- } else if (resultCode == RESULT_TIMEOUT) {
- setResult(resultCode, data);
- finish();
}
}