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

Merge "Fixes crash in face enrollment during set up in work mode" into tm-qpr-dev

Browse Source
This commit is contained in:
Diya Bera
2022-11-09 17:25:35 +00:00
committed by Android (Google) Code Review
parent b93416b26d a26c2d6b37
commit 9cb05bc57b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
View File

@@ -96,15 +96,17 @@ public class MultiBiometricEnrollHelper {
// FLAG_UPDATE_CURRENT ensures it is launched with the most recent values. // FLAG_UPDATE_CURRENT ensures it is launched with the most recent values.
final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity, final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity,
mActivity.getIntent()); 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, final PendingIntent faceAfterFp = PendingIntent.getActivity(mActivity,
0 /* requestCode */, faceIntent, 0 /* requestCode */, faceIntent,
PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
intent.putExtra(EXTRA_ENROLL_AFTER_FINGERPRINT, faceAfterFp); intent.putExtra(EXTRA_ENROLL_AFTER_FINGERPRINT, faceAfterFp);
}
BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL, BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
hardwareAuthToken, mGkPwHandle, mUserId); hardwareAuthToken, mGkPwHandle, mUserId);
}
})); }));
} }
} }