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

Merge "Fixed race condition with different profiles" into qt-r1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-07-25 04:06:20 +00:00
committed by Android (Google) Code Review
parent 14d150e595 a4772064df
commit 5faf43ad73
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/biometrics/BiometricServiceBase.java
View File

@@ -912,8 +912,12 @@ public abstract class BiometricServiceBase extends SystemService
}
protected void setActiveUserInternal(int userId) {
// Do not put on handler, since it should finish before returning to caller.
updateActiveGroup(userId, null /* clientPackage */);
mHandler.post(() -> {
if (DEBUG) {
Slog.d(getTag(), "setActiveUser(" + userId + ")");
}
updateActiveGroup(userId, null /* clientPackage */);
});
}
protected void removeInternal(RemovalClient client) {

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

@@ -611,27 +611,32 @@ public class FaceService extends BiometricServiceBase {
public void resetLockout(byte[] token) {
checkPermission(MANAGE_BIOMETRIC);
if (!FaceService.this.hasEnrolledBiometrics(mCurrentUserId)) {
Slog.w(TAG, "Ignoring lockout reset, no templates enrolled");
return;
}
mHandler.post(() -> {
if (!FaceService.this.hasEnrolledBiometrics(mCurrentUserId)) {
Slog.w(TAG, "Ignoring lockout reset, no templates enrolled");
return;
}
Slog.d(TAG, "Resetting lockout for user: " + mCurrentUserId);
Slog.d(TAG, "Resetting lockout for user: " + mCurrentUserId);
try {
mDaemonWrapper.resetLockout(token);
} catch (RemoteException e) {
Slog.e(getTag(), "Unable to reset lockout", e);
}
try {
mDaemonWrapper.resetLockout(token);
} catch (RemoteException e) {
Slog.e(getTag(), "Unable to reset lockout", e);
}
});
}
@Override
public void setFeature(int userId, int feature, boolean enabled, final byte[] token,
IFaceServiceReceiver receiver, final String opPackageName) {
checkPermission(MANAGE_BIOMETRIC);
updateActiveGroup(userId, opPackageName);
mHandler.post(() -> {
if (DEBUG) {
Slog.d(TAG, "setFeature for user(" + userId + ")");
}
updateActiveGroup(userId, opPackageName);
if (!FaceService.this.hasEnrolledBiometrics(mCurrentUserId)) {
Slog.e(TAG, "No enrolled biometrics while setting feature: " + feature);
return;
@@ -662,9 +667,12 @@ public class FaceService extends BiometricServiceBase {
public void getFeature(int userId, int feature, IFaceServiceReceiver receiver,
final String opPackageName) {
checkPermission(MANAGE_BIOMETRIC);
updateActiveGroup(userId, opPackageName);
mHandler.post(() -> {
if (DEBUG) {
Slog.d(TAG, "getFeature for user(" + userId + ")");
}
updateActiveGroup(userId, opPackageName);
// This should ideally return tri-state, but the user isn't shown settings unless
// they are enrolled so it's fine for now.
if (!FaceService.this.hasEnrolledBiometrics(mCurrentUserId)) {