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

src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtils.java

@@ -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.
      */

src/com/android/settings/safetycenter/BiometricsSafetySource.java

@@ -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 */,