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

Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev

Browse Source
This commit is contained in:
Hao Dong
2022-11-22 17:10:49 +00:00
committed by Android (Google) Code Review
parent 6f908bae6f 8c5d8e694a
commit a01a1857ec
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -24,7 +24,6 @@ import android.content.Intent;
import android.hardware.SensorPrivacyManager; import android.hardware.SensorPrivacyManager;
import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.face.FaceManager; import android.hardware.face.FaceManager;
import android.hardware.face.FaceSensorPropertiesInternal;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html; import android.text.Html;
import android.text.method.LinkMovementMethod; import android.text.method.LinkMovementMethod;
@@ -54,8 +53,6 @@ import com.google.android.setupcompat.template.FooterButton;
import com.google.android.setupcompat.util.WizardManagerHelper; import com.google.android.setupcompat.util.WizardManagerHelper;
import com.google.android.setupdesign.span.LinkSpan; import com.google.android.setupdesign.span.LinkSpan;
import java.util.List;
/** /**
* Provides introductory info about face unlock and prompts the user to agree before starting face * Provides introductory info about face unlock and prompts the user to agree before starting face
* enrollment. * enrollment.
@@ -289,20 +286,12 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
} }
private boolean maxFacesEnrolled() { private boolean maxFacesEnrolled() {
final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
if (mFaceManager != null) { if (mFaceManager != null) {
final List<FaceSensorPropertiesInternal> props =
mFaceManager.getSensorPropertiesInternal();
// This will need to be updated for devices with multiple face sensors. // This will need to be updated for devices with multiple face sensors.
final int max = props.get(0).maxEnrollmentsPerUser;
final int numEnrolledFaces = mFaceManager.getEnrolledFaces(mUserId).size(); final int numEnrolledFaces = mFaceManager.getEnrolledFaces(mUserId).size();
final int maxFacesEnrollableIfSUW = getApplicationContext().getResources() final int maxFacesEnrollable = getApplicationContext().getResources()
.getInteger(R.integer.suw_max_faces_enrollable); .getInteger(R.integer.suw_max_faces_enrollable);
if (isSetupWizard) { return numEnrolledFaces >= maxFacesEnrollable;
return numEnrolledFaces >= maxFacesEnrollableIfSUW;
} else {
return numEnrolledFaces >= max;
}
} else { } else {
return false; return false;
} }