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

Commit 2899c874 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:... 

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

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

Change-Id: I6e7f9d3bbcc76d243713c10b87f4817ebf2118c4
parents f05653b4 5968c28c

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

        }

    }