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

Merge "Forward gatekeeper password handle to enrollment"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-12-16 23:33:12 +00:00
committed by Android (Google) Code Review
parent 46be00eff8 ee1dd50e74
commit 12a10a11d5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/biometrics/BiometricEnrollActivity.java
View File

@@ -89,6 +89,9 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
if (this instanceof InternalActivity) { if (this instanceof InternalActivity) {
mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId()); mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
if (BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
mGkPwHandle = BiometricUtils.getGatekeeperPasswordHandle(getIntent());
}
} }
if (savedInstanceState != null) { if (savedInstanceState != null) {
@@ -366,7 +369,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN); ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
} }
BiometricUtils.launchEnrollForResult(this, intent, 0 /* requestCode */, hardwareAuthToken, BiometricUtils.launchEnrollForResult(this, intent, 0 /* requestCode */, hardwareAuthToken,
null /* gkPwHandle */, mUserId); mGkPwHandle, mUserId);
} }
private void launchCredentialOnlyEnroll() { private void launchCredentialOnlyEnroll() {