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

Browse Source 
am: 007a1aee1b

Change-Id: Ic5d286f40b36c2b745b9d1168e60234015184b6a
This commit is contained in:
joshmccloskey
2019-07-09 15:51:45 -07:00
committed by android-build-merger
parent 209c049dca 007a1aee1b
commit 235405d66e
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 { } else {
intent.setClass(this, FaceEnrollEnrolling.class); intent.setClass(this, FaceEnrollEnrolling.class);
} }
intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked()); WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
if (mResultIntent != null) { if (mResultIntent != null) {
intent.putExtras(mResultIntent); intent.putExtras(mResultIntent);
} }
mNextClicked = true; mNextClicked = true;
WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent); intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked());
startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST); startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
} }