| commit | 2e50c32c8001e36e91877e2748b8f9a4ba516cfd | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Fri Oct 05 11:09:46 2018 -0700 |
| committer | Kevin Chyn <kchyn@google.com> | Fri Oct 05 11:23:59 2018 -0700 |
| tree | 6dffc2ec6930bdc70d7491ae3aa87707732e5e2f | |
| parent | 03f2d1e55d94849d65ac4317f331c9061dd00897 [diff] |
Fix work profile fingerprint userId
Fixes: 117303349
Test: Enabling work profile, FP settings shows independent sets again
(same as P behavior)
Change-Id: Ifddd41c8aaa4316a58c9b8d16905d6d05318f5fd
diff --git a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java index 90d4cc2..379a02b 100644 --- a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
@@ -33,7 +33,7 @@ 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 cd27dbb..8450577 100644 --- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
@@ -46,7 +46,7 @@ @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 2fcff5c..0e1ccd7 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
@@ -45,12 +45,12 @@ @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);