Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2cecc12 authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ide0d2b21c96a12f0a597ece182d5bf4631df4286
parents a03d9cee 4cb6d12b

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

+4 −4
Original line number Diff line number Diff line
@@ -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();

        }

    }