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

Commit 235405d6 authored by joshmccloskey's avatar joshmccloskey Committed by android-build-merger
Browse files

Merge "Diversity extra no longer gets overwritten." into qt-r1-dev 

am: 007a1aee

Change-Id: Ic5d286f40b36c2b745b9d1168e60234015184b6a
parents 209c049d 007a1aee

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

+2 −2
Original line number Diff line number Diff line
@@ -212,12 +212,12 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
        } else {

            intent.setClass(this, FaceEnrollEnrolling.class);

        }

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

        WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);

        if (mResultIntent != null) {

            intent.putExtras(mResultIntent);

        }

        mNextClicked = true;

        WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);

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

        startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);

    }