From ea07bb8d2f5abec307890d09350359dbba802e37 Mon Sep 17 00:00:00 2001 From: Curtis Belmonte Date: Mon, 9 Aug 2021 14:12:45 -0700 Subject: [PATCH] Make face education handle timeout result correctly Ensures that a result code of RESULT_TIMEOUT always causes the face enroll education screen to finish and propagate the result. Test: Lock and unlock screen at each stage of face enrollment Fixes: 194857793 Change-Id: Ie4b09235f923c8a40de18878b0727f166112140f --- .../settings/biometrics/face/FaceEnrollEducation.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java index 08cf5ff12f7..fa8f5564f2e 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java @@ -226,7 +226,10 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 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 @@ public class FaceEnrollEducation extends BiometricEnrollBase { setResult(resultCode, data); finish(); } - } else if (resultCode == RESULT_TIMEOUT) { - setResult(resultCode, data); - finish(); } }