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

Merge "Fix work profile fingerprint userId"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-10-05 23:59:52 +00:00
committed by Android (Google) Code Review
parent de5dbf1a3e 2e50c32c80
commit ebb83a3953
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
View File

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

2
src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
View File

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

4
src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
View File

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