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

Commit ea07bb8d authored by Curtis Belmonte's avatar Curtis Belmonte
Browse files

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
parent b6321f88

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

        }

    }