PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make face education handle timeout result correctly" into sc-dev am: 4cb6d12b55

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15505151

Change-Id: Ide0d2b21c96a12f0a597ece182d5bf4631df4286
This commit is contained in:
Curtis Belmonte
2021-08-10 00:17:34 +00:00
committed by Automerger Merge Worker
parent a03d9cee0b 4cb6d12b55
commit e2cecc12ce
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -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();
}
}