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

Merge "Fix work apps interceptor biometric prompt icon." into main

Browse Source
This commit is contained in:
Hao Dong
2024-11-11 21:18:10 +00:00
committed by Android (Google) Code Review
parent 453aa677e6 d31d6d110c
commit d97646984c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
View File

@@ -21,6 +21,7 @@ import static android.Manifest.permission.SET_BIOMETRIC_DIALOG_ADVANCED;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PASSWORD_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PASSWORD_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PATTERN_HEADER;
import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PIN_HEADER; import static android.app.admin.DevicePolicyResources.Strings.Settings.CONFIRM_WORK_PROFILE_PIN_HEADER;
import static android.content.Intent.EXTRA_PACKAGE_NAME;
import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS; import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
import static com.android.systemui.biometrics.Utils.toBitmap; import static com.android.systemui.biometrics.Utils.toBitmap;
@@ -152,8 +153,10 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
== BiometricPrompt.AUTHENTICATION_RESULT_TYPE_DEVICE_CREDENTIAL; == BiometricPrompt.AUTHENTICATION_RESULT_TYPE_DEVICE_CREDENTIAL;
ConfirmDeviceCredentialUtils.reportSuccessfulAttempt(mLockPatternUtils, mUserManager, ConfirmDeviceCredentialUtils.reportSuccessfulAttempt(mLockPatternUtils, mUserManager,
mDevicePolicyManager, mUserId, isStrongAuth); mDevicePolicyManager, mUserId, isStrongAuth);
ConfirmDeviceCredentialUtils.checkForPendingIntent( if (isInternalActivity()) {
ConfirmDeviceCredentialActivity.this); ConfirmDeviceCredentialUtils.checkForPendingIntent(
ConfirmDeviceCredentialActivity.this);
}
setResult(Activity.RESULT_OK); setResult(Activity.RESULT_OK);
finish(); finish();
@@ -244,7 +247,14 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
promptInfo.setDisallowBiometricsIfPolicyExists(mCheckDevicePolicyManager); promptInfo.setDisallowBiometricsIfPolicyExists(mCheckDevicePolicyManager);
promptInfo.setAuthenticators(mBiometricsAuthenticators); promptInfo.setAuthenticators(mBiometricsAuthenticators);
promptInfo.setNegativeButtonText(negativeButtonText); promptInfo.setNegativeButtonText(negativeButtonText);
promptInfo.setRealCallerForConfirmDeviceCredentialActivity(getCallingActivity());
final String callerPackageName = intent.getStringExtra(EXTRA_PACKAGE_NAME);
if (isInternalActivity() && callerPackageName != null) {
promptInfo.setRealCallerForConfirmDeviceCredentialActivity(
new ComponentName(callerPackageName, ""));
} else {
promptInfo.setRealCallerForConfirmDeviceCredentialActivity(getCallingActivity());
}
if (android.multiuser.Flags.enablePrivateSpaceFeatures() if (android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.usePrivateSpaceIconInBiometricPrompt() && android.multiuser.Flags.usePrivateSpaceIconInBiometricPrompt()