Bug fix - when enrolled, biometrics have ok safety state.
Bug: 222336582 Test: atest SettingsUnitTests Change-Id: Ia90329fa126b181e87ff7ed626ba33eca1e6bf7d
This commit is contained in:
@@ -55,6 +55,13 @@ public class CombinedBiometricStatusUtils {
|
||||
return Utils.hasFingerprintHardware(mContext) && Utils.hasFaceHardware(mContext);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns whether at least one face template or fingerprint has been enrolled.
|
||||
*/
|
||||
public boolean hasEnrolled() {
|
||||
return hasEnrolledFingerprints() || hasEnrolledFace();
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the {@link EnforcedAdmin} in case parental consent is required to change both
|
||||
* face and fingerprint settings.
|
||||
@@ -84,8 +91,7 @@ public class CombinedBiometricStatusUtils {
|
||||
public String getSummary() {
|
||||
final int numFingerprintsEnrolled = mFingerprintManager != null
|
||||
? mFingerprintManager.getEnrolledFingerprints(mUserId).size() : 0;
|
||||
final boolean faceEnrolled = mFaceManager != null
|
||||
&& mFaceManager.hasEnrolledTemplates(mUserId);
|
||||
final boolean faceEnrolled = hasEnrolledFace();
|
||||
|
||||
if (faceEnrolled && numFingerprintsEnrolled > 1) {
|
||||
return mContext.getString(
|
||||
@@ -105,6 +111,14 @@ public class CombinedBiometricStatusUtils {
|
||||
}
|
||||
}
|
||||
|
||||
private boolean hasEnrolledFingerprints() {
|
||||
return mFingerprintManager != null && mFingerprintManager.hasEnrolledFingerprints(mUserId);
|
||||
}
|
||||
|
||||
private boolean hasEnrolledFace() {
|
||||
return mFaceManager != null && mFaceManager.hasEnrolledTemplates(mUserId);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the class name of the Settings page corresponding to combined biometric settings.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user