Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Identity Check for Fingerprint Settings" into main

Browse Source
This commit is contained in:
Diya Bera
2025-03-07 09:49:13 -08:00
committed by Android (Google) Code Review
parent 853fd959c2 b5482ac6a9
commit ea342bbd82
3 changed files with 76 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/com/android/settings/Utils.java
View File

@@ -27,6 +27,7 @@ import static android.text.format.DateUtils.FORMAT_SHOW_DATE;
import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_AUTHENTICATORS;
import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_HIDE_BACKGROUND;
import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT;
import static com.android.settings.password.ConfirmDeviceCredentialActivity.EXTRA_DATA;
import android.app.ActionBar;
import android.app.Activity;
@@ -1549,7 +1550,29 @@ public final class Utils extends com.android.settingslib.Utils {
final UserManager userManager = (UserManager) fragment.getContext().getSystemService(
UserManager.class);
fragment.startActivityForResult(getIntentForBiometricAuthentication(fragment.getResources(),
getEffectiveUserId(userManager, userId), hideBackground), requestCode);
getEffectiveUserId(userManager, userId), hideBackground, null /* data */),
requestCode);
}
/**
* Launch biometric prompt for mandatory biometrics. Call
* {@link #requestBiometricAuthenticationForMandatoryBiometrics(Context, boolean, int)}
* to check if all requirements for mandatory biometrics is satisfied
* before launching biometric prompt.
*
* @param fragment corresponding fragment of the surface
* @param requestCode for starting the new activity
* @param userId user id for the authentication request
* @param hideBackground if the background activity screen needs to be hidden
* @param data additional info to returned to the activity after authentication
* has ended
*/
public static void launchBiometricPromptForMandatoryBiometrics(@NonNull Fragment fragment,
int requestCode, int userId, boolean hideBackground, @Nullable Intent data) {
final UserManager userManager = (UserManager) fragment.getContext().getSystemService(
UserManager.class);
fragment.startActivityForResult(getIntentForBiometricAuthentication(fragment.getResources(),
getEffectiveUserId(userManager, userId), hideBackground, data), requestCode);
}
/**
@@ -1568,7 +1591,7 @@ public final class Utils extends com.android.settingslib.Utils {
final UserManager userManager = activity.getSystemService(UserManager.class);
activity.startActivityForResult(getIntentForBiometricAuthentication(
activity.getResources(), getEffectiveUserId(userManager, userId),
hideBackground), requestCode);
hideBackground, null /* data */), requestCode);
}
private static int getEffectiveUserId(UserManager userManager, int userId) {
@@ -1579,7 +1602,7 @@ public final class Utils extends com.android.settingslib.Utils {
}
private static Intent getIntentForBiometricAuthentication(Resources resources,
int effectiveUserId, boolean hideBackground) {
int effectiveUserId, boolean hideBackground, @Nullable Intent data) {
final Intent intent = new Intent();
if (android.hardware.biometrics.Flags.mandatoryBiometrics()) {
intent.putExtra(BIOMETRIC_PROMPT_AUTHENTICATORS,
@@ -1592,6 +1615,7 @@ public final class Utils extends com.android.settingslib.Utils {
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, true);
intent.putExtra(EXTRA_USER_ID, effectiveUserId);
intent.putExtra(BIOMETRIC_PROMPT_HIDE_BACKGROUND, hideBackground);
intent.putExtra(EXTRA_DATA, data);
intent.setClassName(SETTINGS_PACKAGE_NAME,
ConfirmDeviceCredentialActivity.InternalActivity.class.getName());
return intent;