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

Update constants

Browse Source 
Flag: N/A
Test: N/A
Bug: 289548794
Change-Id: Ifcc0592583697efb105167b6c168c40a3299dc54
This commit is contained in:
Diya Bera
2024-04-13 16:09:28 -07:00
parent e24b145d48
commit d8ad8e17b0
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
View File

@@ -17,10 +17,12 @@
package com.android.settings.biometrics.face; package com.android.settings.biometrics.face;
import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE; import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FACE;
import static android.hardware.biometrics.BiometricFaceConstants.FACE_ERROR_TIMEOUT;
import static android.hardware.biometrics.BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION;
import static android.hardware.biometrics.BiometricFaceConstants.FEATURE_REQUIRE_REQUIRE_DIVERSITY;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Intent; import android.content.Intent;
import android.hardware.face.FaceManager;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -112,10 +114,10 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling {
); );
if (!getIntent().getBooleanExtra(BiometricEnrollBase.EXTRA_KEY_REQUIRE_DIVERSITY, true)) { if (!getIntent().getBooleanExtra(BiometricEnrollBase.EXTRA_KEY_REQUIRE_DIVERSITY, true)) {
mDisabledFeatures.add(FaceManager.FEATURE_REQUIRE_REQUIRE_DIVERSITY); mDisabledFeatures.add(FEATURE_REQUIRE_REQUIRE_DIVERSITY);
} }
if (!getIntent().getBooleanExtra(BiometricEnrollBase.EXTRA_KEY_REQUIRE_VISION, true)) { if (!getIntent().getBooleanExtra(BiometricEnrollBase.EXTRA_KEY_REQUIRE_VISION, true)) {
mDisabledFeatures.add(FaceManager.FEATURE_REQUIRE_ATTENTION); mDisabledFeatures.add(FEATURE_REQUIRE_ATTENTION);
} }
startEnrollment(); startEnrollment();
@@ -190,7 +192,7 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling {
public void onEnrollmentError(int errMsgId, CharSequence errString) { public void onEnrollmentError(int errMsgId, CharSequence errString) {
int msgId; int msgId;
switch (errMsgId) { switch (errMsgId) {
case FaceManager.FACE_ERROR_TIMEOUT: case FACE_ERROR_TIMEOUT:
msgId = R.string.security_settings_face_enroll_error_timeout_dialog_message; msgId = R.string.security_settings_face_enroll_error_timeout_dialog_message;
break; break;
default: default:

12
src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.biometrics.face; package com.android.settings.biometrics.face;
import static android.hardware.biometrics.BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION;
import android.content.Context; import android.content.Context;
import android.hardware.face.FaceManager; import android.hardware.face.FaceManager;
import android.hardware.face.FaceManager.GetFeatureCallback; import android.hardware.face.FaceManager.GetFeatureCallback;
@@ -42,7 +44,7 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
private final SetFeatureCallback mSetFeatureCallback = new SetFeatureCallback() { private final SetFeatureCallback mSetFeatureCallback = new SetFeatureCallback() {
@Override @Override
public void onCompleted(boolean success, int feature) { public void onCompleted(boolean success, int feature) {
if (feature == FaceManager.FEATURE_REQUIRE_ATTENTION) { if (feature == FEATURE_REQUIRE_ATTENTION) {
mPreference.setEnabled(true); mPreference.setEnabled(true);
if (!success) { if (!success) {
mPreference.setChecked(!mPreference.isChecked()); mPreference.setChecked(!mPreference.isChecked());
@@ -60,7 +62,7 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
public void onCompleted(boolean success, int[] features, boolean[] featureState) { public void onCompleted(boolean success, int[] features, boolean[] featureState) {
boolean requireAttentionEnabled = false; boolean requireAttentionEnabled = false;
for (int i = 0; i < features.length; i++) { for (int i = 0; i < features.length; i++) {
if (features[i] == FaceManager.FEATURE_REQUIRE_ATTENTION) { if (features[i] == FEATURE_REQUIRE_ATTENTION) {
requireAttentionEnabled = featureState[i]; requireAttentionEnabled = featureState[i];
} }
} }
@@ -98,7 +100,7 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
} }
// Set to disabled until we know the true value. // Set to disabled until we know the true value.
mPreference.setEnabled(false); mPreference.setEnabled(false);
mFaceManager.getFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION, mFaceManager.getFeature(getUserId(), FEATURE_REQUIRE_ATTENTION,
mGetFeatureCallback); mGetFeatureCallback);
// Ideally returns a cached value. // Ideally returns a cached value.
@@ -111,8 +113,8 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe
mPreference.setEnabled(false); mPreference.setEnabled(false);
mPreference.setChecked(isChecked); mPreference.setChecked(isChecked);
mFaceManager.setFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked, mFaceManager.setFeature(getUserId(), FEATURE_REQUIRE_ATTENTION,
mToken, mSetFeatureCallback); isChecked, mToken, mSetFeatureCallback);
return true; return true;
} }