Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8ad8e17 authored by Diya Bera's avatar Diya Bera
Browse files

Update constants 

Flag: N/A
Test: N/A
Bug: 289548794
Change-Id: Ifcc0592583697efb105167b6c168c40a3299dc54
parent e24b145d

src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java

+6 −4
Original line number Diff line number Diff line
@@ -17,10 +17,12 @@ 
package com.android.settings.biometrics.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.content.Intent;

import android.hardware.face.FaceManager;

import android.os.Bundle;

import android.text.TextUtils;

import android.util.Log;
@@ -112,10 +114,10 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { 
        );



        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)) {

            mDisabledFeatures.add(FaceManager.FEATURE_REQUIRE_ATTENTION);

            mDisabledFeatures.add(FEATURE_REQUIRE_ATTENTION);

        }



        startEnrollment();
@@ -190,7 +192,7 @@ public class FaceEnrollEnrolling extends BiometricsEnrollEnrolling { 
    public void onEnrollmentError(int errMsgId, CharSequence errString) {

        int msgId;

        switch (errMsgId) {

            case FaceManager.FACE_ERROR_TIMEOUT:

            case FACE_ERROR_TIMEOUT:

                msgId = R.string.security_settings_face_enroll_error_timeout_dialog_message;

                break;

            default:

src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java

+7 −5
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settings.biometrics.face;



import static android.hardware.biometrics.BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION;



import android.content.Context;

import android.hardware.face.FaceManager;

import android.hardware.face.FaceManager.GetFeatureCallback;
@@ -42,7 +44,7 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe 
    private final SetFeatureCallback mSetFeatureCallback = new SetFeatureCallback() {

        @Override

        public void onCompleted(boolean success, int feature) {

            if (feature == FaceManager.FEATURE_REQUIRE_ATTENTION) {

            if (feature == FEATURE_REQUIRE_ATTENTION) {

                mPreference.setEnabled(true);

                if (!success) {

                    mPreference.setChecked(!mPreference.isChecked());
@@ -60,7 +62,7 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe 
        public void onCompleted(boolean success, int[] features, boolean[] featureState) {

            boolean requireAttentionEnabled = false;

            for (int i = 0; i < features.length; i++) {

                if (features[i] == FaceManager.FEATURE_REQUIRE_ATTENTION) {

                if (features[i] == FEATURE_REQUIRE_ATTENTION) {

                    requireAttentionEnabled = featureState[i];

                }

            }
@@ -98,7 +100,7 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe 
        }

        // Set to disabled until we know the true value.

        mPreference.setEnabled(false);

        mFaceManager.getFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION,

        mFaceManager.getFeature(getUserId(), FEATURE_REQUIRE_ATTENTION,

                mGetFeatureCallback);



        // Ideally returns a cached value.
@@ -111,8 +113,8 @@ public class FaceSettingsAttentionPreferenceController extends FaceSettingsPrefe 
        mPreference.setEnabled(false);

        mPreference.setChecked(isChecked);



        mFaceManager.setFeature(getUserId(), FaceManager.FEATURE_REQUIRE_ATTENTION, isChecked,

                mToken, mSetFeatureCallback);

        mFaceManager.setFeature(getUserId(), FEATURE_REQUIRE_ATTENTION,

                isChecked, mToken, mSetFeatureCallback);

        return true;

    }