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

Merge "Update require attention in stats pull service" into rvc-qpr-dev

Browse Source
This commit is contained in:
Joshua Mccloskey
2020-10-21 17:23:21 +00:00
committed by Android (Google) Code Review
parent 9d0d38228c 3d1ca9464e
commit 55b11b16c1
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -77,8 +77,10 @@ import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PermissionInfo; import android.content.pm.PermissionInfo;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.hardware.biometrics.BiometricFaceConstants;
import android.hardware.biometrics.BiometricsProtoEnums; import android.hardware.biometrics.BiometricsProtoEnums;
import android.hardware.face.FaceManager; import android.hardware.face.FaceManager;
import android.hardware.face.FaceManager.GetFeatureCallback;
import android.hardware.fingerprint.FingerprintManager; import android.hardware.fingerprint.FingerprintManager;
import android.hardware.health.V2_0.IHealth; import android.hardware.health.V2_0.IHealth;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
@@ -3327,9 +3329,30 @@ public class StatsPullAtomService extends SystemService {
try { try {
List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers(); List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();
int numUsers = users.size(); int numUsers = users.size();
FaceManager faceManager = mContext.getSystemService(FaceManager.class);
for (int userNum = 0; userNum < numUsers; userNum++) { for (int userNum = 0; userNum < numUsers; userNum++) {
int userId = users.get(userNum).getUserHandle().getIdentifier(); int userId = users.get(userNum).getUserHandle().getIdentifier();
if (faceManager != null) {
// Store the current setting from the Face HAL, and upon next upload the value
// reported will be correct (given the user did not modify it).
faceManager.getFeature(userId, BiometricFaceConstants.FEATURE_REQUIRE_ATTENTION,
new GetFeatureCallback() {
@Override
public void onCompleted(boolean success, int feature,
boolean value) {
if (feature == FaceManager.FEATURE_REQUIRE_ATTENTION
&& success) {
Settings.Secure.putIntForUser(mContext.getContentResolver(),
Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,
value ? 1 : 0, userId);
}
}
}
);
}
int unlockKeyguardEnabled = Settings.Secure.getIntForUser( int unlockKeyguardEnabled = Settings.Secure.getIntForUser(
mContext.getContentResolver(), mContext.getContentResolver(),
Settings.Secure.FACE_UNLOCK_KEYGUARD_ENABLED, 1, userId); Settings.Secure.FACE_UNLOCK_KEYGUARD_ENABLED, 1, userId);