Revert "Read and cache features when user switches"

Bug: 169018666

This reverts commit 99415f0514.
Reason for revert: b/169018666

Change-Id: I1de119a5448e3d2779a11ad7a249d31d3103317f
Merged-In: I0187e27b641edf0836fa187530cb2a193082fe5d
This commit is contained in:
Kevin Chyn
2020-09-21 18:56:32 +00:00
parent 99415f0514
commit 914263e2ab

View File

@@ -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);
}