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

Merge "Add mandatory biometric prompt to platform surfaces (2/N)" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-07-03 02:39:11 +00:00
committed by Android (Google) Code Review
parent 3ba119a90c 606bfb3057
commit a56866ddaa
3 changed files with 92 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/MainClear.java
View File

@@ -99,6 +99,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
static final int KEYGUARD_REQUEST = 55;
@VisibleForTesting
static final int CREDENTIAL_CONFIRM_REQUEST = 56;
static final int BIOMETRICS_REQUEST = 57;
private static final String KEY_SHOW_ESIM_RESET_CHECKBOX =
"masterclear.allow_retain_esim_profiles_after_fdr";
@@ -156,7 +157,8 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
@VisibleForTesting
boolean isValidRequestCode(int requestCode) {
return !((requestCode != KEYGUARD_REQUEST) && (requestCode != CREDENTIAL_CONFIRM_REQUEST));
return !((requestCode != KEYGUARD_REQUEST) && (requestCode != CREDENTIAL_CONFIRM_REQUEST)
&& (requestCode != BIOMETRICS_REQUEST));
}
@Override
@@ -179,9 +181,18 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
return;
}
if (requestCode == KEYGUARD_REQUEST) {
if (Utils.requestBiometricAuthenticationForMandatoryBiometrics(getActivity(),
false /* biometricsSuccessfullyAuthenticated */,
false /* biometricsAuthenticationRequested */)) {
Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRICS_REQUEST);
return;
}
}
Intent intent = null;
// If returning from a Keyguard request, try to show an account confirmation request if
// applciable.
// applicable.
if (CREDENTIAL_CONFIRM_REQUEST != requestCode
&& (intent = getAccountConfirmationIntent()) != null) {
showAccountCredentialConfirmation(intent);