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

Commit f45af993 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't also skip fingerprint in SUW when skipping face" into sc-dev am: b1ba3c57 

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

Change-Id: I2654f712d818faca6d04f6394bfe4aae72a06844
parents 747b83b0 b1ba3c57

src/com/android/settings/biometrics/BiometricEnrollIntroduction.java

+7 −3
Original line number Diff line number Diff line
@@ -284,8 +284,10 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
    @Override

    protected void onActivityResult(int requestCode, int resultCode, Intent data) {

        if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST) {

            if (resultCode == RESULT_FINISHED || resultCode == RESULT_SKIP

                    || resultCode == RESULT_TIMEOUT) {

            if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED) {

                onSkipButtonClick(mFooterBarMixin.getSecondaryButtonView());

                return;

            } else if (resultCode == RESULT_TIMEOUT) {

                setResult(resultCode, data);

                finish();

                return;
@@ -335,7 +337,9 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase 
            overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out);

        } else if (requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {

            Log.d(TAG, "ENROLL_NEXT_BIOMETRIC_REQUEST, result: " + resultCode);

            if (resultCode != RESULT_CANCELED) {

            if (resultCode == RESULT_SKIP || resultCode == RESULT_FINISHED) {

                onSkipButtonClick(mFooterBarMixin.getSecondaryButtonView());

            } else if (resultCode != RESULT_CANCELED) {

                setResult(resultCode, data);

                finish();

            }