Merge "Fix work profile fingerprint userId"

src/com/android/settings/biometrics/BiometricStatusPreferenceController.java

@@ -33,7 +33,7 @@ public abstract class BiometricStatusPreferenceController extends BasePreference
     protected final UserManager mUm;
     protected final LockPatternUtils mLockPatternUtils;
 
-    protected final int mUserId = UserHandle.myUserId();
+    private final int mUserId = UserHandle.myUserId();
     protected final int mProfileChallengeUserId;
 
     /**

src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java

@@ -46,7 +46,7 @@ public class FaceStatusPreferenceController extends BiometricStatusPreferenceCon
 
     @Override
     protected boolean hasEnrolledBiometrics() {
-        return mFaceManager.hasEnrolledTemplates(mUserId);
+        return mFaceManager.hasEnrolledTemplates(getUserId());
     }
 
     @Override

src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java

@@ -45,12 +45,12 @@ public class FingerprintStatusPreferenceController extends BiometricStatusPrefer
 
     @Override
     protected boolean hasEnrolledBiometrics() {
-        return mFingerprintManager.hasEnrolledFingerprints(mUserId);
+        return mFingerprintManager.hasEnrolledFingerprints(getUserId());
     }
 
     @Override
     protected String getSummaryTextEnrolled() {
-        final int numEnrolled = mFingerprintManager.getEnrolledFingerprints(mUserId).size();
+        final int numEnrolled = mFingerprintManager.getEnrolledFingerprints(getUserId()).size();
         return mContext.getResources().getQuantityString(
                 R.plurals.security_settings_fingerprint_preference_summary,
                 numEnrolled, numEnrolled);