From a26c2d6b372102149f8529a0488dc5ed6fb51191 Mon Sep 17 00:00:00 2001 From: Diya Bera Date: Wed, 2 Nov 2022 17:48:37 +0000 Subject: [PATCH] Fixes crash in face enrollment during set up in work mode Copying extras in face intent to avoid incorrect information later in the lifecycle. Fixes: 247049655 Test: Manual Change-Id: I4c394a2f7b9e80d6ddc6ef385c3ab11ecf56387b --- .../biometrics/MultiBiometricEnrollHelper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java index 94fbb76ac60..5d0b63c5ffb 100644 --- a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java +++ b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java @@ -96,15 +96,17 @@ public class MultiBiometricEnrollHelper { // FLAG_UPDATE_CURRENT ensures it is launched with the most recent values. final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity, mActivity.getIntent()); - faceIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, mGkPwHandle); + faceIntent.putExtra(Intent.EXTRA_USER_ID, mUserId); + faceIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, + mGkPwHandle); final PendingIntent faceAfterFp = PendingIntent.getActivity(mActivity, 0 /* requestCode */, faceIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); intent.putExtra(EXTRA_ENROLL_AFTER_FINGERPRINT, faceAfterFp); - } - BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL, - hardwareAuthToken, mGkPwHandle, mUserId); + BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL, + hardwareAuthToken, mGkPwHandle, mUserId); + } })); } }