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

Commit 2d461c8f authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Merge "Revert "Read and cache features when user switches"" into rvc-qpr-dev am: ce7cd417 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12654018

Change-Id: Ia22dc5ad1c9e10f87f4e483ed313fd63181ff751
parents 200a4444 ce7cd417

services/core/java/com/android/server/biometrics/face/FaceService.java

+1 −17
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.content.Intent; 
import android.content.pm.UserInfo;

import android.hardware.biometrics.BiometricAuthenticator;

import android.hardware.biometrics.BiometricConstants;

import android.hardware.biometrics.BiometricFaceConstants;

import android.hardware.biometrics.BiometricsProtoEnums;

import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;

import android.hardware.biometrics.IBiometricServiceReceiverInternal;
@@ -605,8 +604,6 @@ public class FaceService extends BiometricServiceBase { 
                return false;

            }



            getFeature(userId, BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION,

                    null /* receiver */, opPackageName);

            return FaceService.this.hasEnrolledBiometrics(userId);

        }
@@ -695,20 +692,7 @@ public class FaceService extends BiometricServiceBase { 
                if (mDaemon != null) {

                    try {

                        OptionalBool result = mDaemon.getFeature(feature, faceId);

                        if (receiver != null) {

                            receiver.onFeatureGet(result.status == Status.OK,

                                    feature, result.value);

                        }



                        if (result.status == Status.OK

                                && feature == BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION) {

                            final int settingsValue = result.value ? 1 : 0;

                            Slog.d(TAG, "Updating attention value for user: " + mCurrentUserId

                                    + " to value: " + settingsValue);

                            Settings.Secure.putIntForUser(getContext().getContentResolver(),

                                    Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,

                                    settingsValue, mCurrentUserId);

                        }

                        receiver.onFeatureGet(result.status == Status.OK, feature, result.value);

                    } catch (RemoteException e) {

                        Slog.e(getTag(), "Unable to getRequireAttention", e);

                    }