PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Diversity extra no longer gets overwritten." into qt-r1-dev am: 007a1aee1b

Browse Source 
am: 235405d66e

Change-Id: I9bd28728f6c8700209324d879d0eb6e7b7aa47ad
This commit is contained in:
joshmccloskey
2019-07-09 16:03:48 -07:00
committed by android-build-merger
parent 9acfbdbe04 235405d66e
commit 582ac25006
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -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);
}