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

Commit f4099a8f authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Propagate intent extras and finish activity properly" into qt-dev 

am: 7ac16f15

Change-Id: I5bc447218d41fc098ea489c5fb8defdf5381f88d
parents b202df44 7ac16f15

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

+10 −2
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
    private IllustrationVideoView mIllustrationNormal;

    private View mIllustrationAccessibility;

    private Handler mHandler;

    private Intent mResultIntent;



    private CompoundButton.OnCheckedChangeListener mSwitchDiversityListener =

            new CompoundButton.OnCheckedChangeListener() {
@@ -151,6 +152,9 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
            intent.setClass(this, FaceEnrollEnrolling.class);

        }

        intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked());

        if (mResultIntent != null) {

            intent.putExtras(mResultIntent);

        }

        WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);

        startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);

    }
@@ -162,11 +166,15 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 


    @Override

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

        mResultIntent = data;

        if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST) {

            // If the user finished or skipped enrollment, finish this activity

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

                setResult(resultCode);

                finish();

            }

        }

    }



    @Override

    public int getMetricsCategory() {