From 2e50c32c8001e36e91877e2748b8f9a4ba516cfd Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Fri, 5 Oct 2018 11:09:46 -0700 Subject: [PATCH] Fix work profile fingerprint userId Fixes: 117303349 Test: Enabling work profile, FP settings shows independent sets again (same as P behavior) Change-Id: Ifddd41c8aaa4316a58c9b8d16905d6d05318f5fd --- .../biometrics/BiometricStatusPreferenceController.java | 2 +- .../biometrics/face/FaceStatusPreferenceController.java | 2 +- .../fingerprint/FingerprintStatusPreferenceController.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java index 90d4cc2f1f9..379a02b7479 100644 --- a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java +++ b/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; /** diff --git a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java index cd27dbbe3d5..84505772092 100644 --- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java +++ b/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 diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java index 2fcff5c8822..0e1ccd7839a 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java +++ b/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);