Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ia22dc5ad1c9e10f87f4e483ed313fd63181ff751
This commit is contained in:
Kevin Chyn
2020-09-22 00:32:30 +00:00
committed by Automerger Merge Worker
parent 200a444461 ce7cd417c3
commit 2d461c8f53
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/core/java/com/android/server/biometrics/face/FaceService.java
View File

@@ -33,7 +33,6 @@ import android.content.Intent;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.hardware.biometrics.BiometricAuthenticator; import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.BiometricConstants; import android.hardware.biometrics.BiometricConstants;
import android.hardware.biometrics.BiometricFaceConstants;
import android.hardware.biometrics.BiometricsProtoEnums; import android.hardware.biometrics.BiometricsProtoEnums;
import android.hardware.biometrics.IBiometricServiceLockoutResetCallback; import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
import android.hardware.biometrics.IBiometricServiceReceiverInternal; import android.hardware.biometrics.IBiometricServiceReceiverInternal;
@@ -605,8 +604,6 @@ public class FaceService extends BiometricServiceBase {
return false; return false;
} }
getFeature(userId, BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION,
null /* receiver */, opPackageName);
return FaceService.this.hasEnrolledBiometrics(userId); return FaceService.this.hasEnrolledBiometrics(userId);
} }
@@ -695,20 +692,7 @@ public class FaceService extends BiometricServiceBase {
if (mDaemon != null) { if (mDaemon != null) {
try { try {
OptionalBool result = mDaemon.getFeature(feature, faceId); OptionalBool result = mDaemon.getFeature(feature, faceId);
if (receiver != null) { receiver.onFeatureGet(result.status == Status.OK, feature, result.value);
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);
}
} catch (RemoteException e) { } catch (RemoteException e) {
Slog.e(getTag(), "Unable to getRequireAttention", e); Slog.e(getTag(), "Unable to getRequireAttention", e);
} }