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

Merge "Redirect to the right combined biometrics in work profile." into udc-dev

Browse Source
This commit is contained in:
Elliot Sisteron
2023-04-13 07:55:05 +00:00
committed by Android (Google) Code Review
parent 7c1f28d0e1 6a1ec7553c
commit 37dad2b3d4
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java
View File

@@ -132,6 +132,19 @@ public class CombinedBiometricStatusUtils {
return mFaceManager != null && mFaceManager.hasEnrolledTemplates(mUserId);
}
/**
* Returns the class name of the Settings page corresponding to combined biometric settings
* based on the current user.
*/
public String getSettingsClassNameBasedOnUser() {
UserManager userManager = mContext.getSystemService(UserManager.class);
if (userManager != null && userManager.isProfile()) {
return getProfileSettingsClassName();
} else {
return getSettingsClassName();
}
}
/**
* Returns the class name of the Settings page corresponding to combined biometric settings.
*/

2
src/com/android/settings/safetycenter/BiometricsSafetySource.java
View File

@@ -85,7 +85,7 @@ public final class BiometricsSafetySource {
combinedBiometricStatusUtils.getSummary(),
createPendingIntent(context,
biometricNavigationUtils.getBiometricSettingsIntent(context,
combinedBiometricStatusUtils.getSettingsClassName(),
combinedBiometricStatusUtils.getSettingsClassNameBasedOnUser(),
disablingAdmin, Bundle.EMPTY),
REQUEST_CODE_COMBINED_BIOMETRIC_SETTING),
disablingAdmin == null /* enabled */,