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

Merge "Set component name only for ConfirmDeviceCredentialActivity." into main

Browse Source
This commit is contained in:
Hao Dong
2024-08-10 04:44:08 +00:00
committed by Android (Google) Code Review
parent 6c3abd0bce 3d357eedb8
commit f56a1bccba
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/password/BiometricFragment.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.password;
import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED; import static android.hardware.biometrics.BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.ComponentName;
import android.hardware.biometrics.BiometricManager; import android.hardware.biometrics.BiometricManager;
import android.hardware.biometrics.BiometricPrompt; import android.hardware.biometrics.BiometricPrompt;
import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback; import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
@@ -44,7 +43,6 @@ public class BiometricFragment extends InstrumentedFragment {
private static final String TAG = "ConfirmDeviceCredential/BiometricFragment"; private static final String TAG = "ConfirmDeviceCredential/BiometricFragment";
private static final String KEY_PROMPT_INFO = "prompt_info"; private static final String KEY_PROMPT_INFO = "prompt_info";
private static final String KEY_CALLING_ACTIVITY = "calling_activity";
// Re-set by the application. Should be done upon orientation changes, etc // Re-set by the application. Should be done upon orientation changes, etc
private Executor mClientExecutor; private Executor mClientExecutor;
@@ -94,13 +92,10 @@ public class BiometricFragment extends InstrumentedFragment {
* @param promptInfo * @param promptInfo
* @return * @return
*/ */
public static BiometricFragment newInstance(PromptInfo promptInfo, public static BiometricFragment newInstance(PromptInfo promptInfo) {
ComponentName callingActivity) {
BiometricFragment biometricFragment = new BiometricFragment(); BiometricFragment biometricFragment = new BiometricFragment();
final Bundle bundle = new Bundle(); final Bundle bundle = new Bundle();
bundle.putParcelable(KEY_PROMPT_INFO, promptInfo); bundle.putParcelable(KEY_PROMPT_INFO, promptInfo);
bundle.putParcelable(KEY_CALLING_ACTIVITY, callingActivity);
biometricFragment.setArguments(bundle); biometricFragment.setArguments(bundle);
return biometricFragment; return biometricFragment;
} }
@@ -135,8 +130,6 @@ public class BiometricFragment extends InstrumentedFragment {
final Bundle bundle = getArguments(); final Bundle bundle = getArguments();
final PromptInfo promptInfo = bundle.getParcelable(KEY_PROMPT_INFO); final PromptInfo promptInfo = bundle.getParcelable(KEY_PROMPT_INFO);
final ComponentName callingActivity = bundle.getParcelable(KEY_CALLING_ACTIVITY);
BiometricPrompt.Builder promptBuilder = new BiometricPrompt.Builder(getContext()) BiometricPrompt.Builder promptBuilder = new BiometricPrompt.Builder(getContext())
.setTitle(promptInfo.getTitle()) .setTitle(promptInfo.getTitle())
.setUseDefaultTitle() // use default title if title is null/empty .setUseDefaultTitle() // use default title if title is null/empty
@@ -152,7 +145,8 @@ public class BiometricFragment extends InstrumentedFragment {
promptInfo.isDisallowBiometricsIfPolicyExists()) promptInfo.isDisallowBiometricsIfPolicyExists())
.setShowEmergencyCallButton(promptInfo.isShowEmergencyCallButton()) .setShowEmergencyCallButton(promptInfo.isShowEmergencyCallButton())
.setReceiveSystemEvents(true) .setReceiveSystemEvents(true)
.setComponentNameForConfirmDeviceCredentialActivity(callingActivity); .setRealCallerForConfirmDeviceCredentialActivity(
promptInfo.getRealCallerForConfirmDeviceCredentialActivity());
if (promptInfo.getLogoRes() != 0){ if (promptInfo.getLogoRes() != 0){
promptBuilder.setLogoRes(promptInfo.getLogoRes()); promptBuilder.setLogoRes(promptInfo.getLogoRes());
} }

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

@@ -238,6 +238,7 @@ 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());
if (android.multiuser.Flags.enablePrivateSpaceFeatures() if (android.multiuser.Flags.enablePrivateSpaceFeatures()
&& android.multiuser.Flags.usePrivateSpaceIconInBiometricPrompt() && android.multiuser.Flags.usePrivateSpaceIconInBiometricPrompt()
@@ -503,8 +504,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
boolean newFragment = false; boolean newFragment = false;
if (mBiometricFragment == null) { if (mBiometricFragment == null) {
mBiometricFragment = BiometricFragment.newInstance(promptInfo, mBiometricFragment = BiometricFragment.newInstance(promptInfo);
getCallingActivity());
newFragment = true; newFragment = true;
} }
mBiometricFragment.setCallbacks(mExecutor, mAuthenticationCallback); mBiometricFragment.setCallbacks(mExecutor, mAuthenticationCallback);