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

Merge "ResetLockout should be scheduled on FaceService's handler" into qt-r1-dev

Browse Source 
am: 7809a34760

Change-Id: I5b799c9e30efcd1e5254228b2c3db58f894d4f5f
This commit is contained in:
Kevin Chyn
2019-07-28 16:46:04 -07:00
committed by android-build-merger
parent cdf9c28caa 7809a34760
commit 75ffd07e49
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,16 +344,19 @@ public class FaceService extends BiometricServiceBase {
@Override // Binder call
public int revokeChallenge(IBinder token) {
checkPermission(MANAGE_BIOMETRIC);
// TODO(b/137106905): Schedule binder calls in FaceService to avoid deadlocks.
if (getCurrentClient() == null) {
// if we aren't handling any other HIDL calls (mCurrentClient == null), revoke the
// challenge right away.
return startRevokeChallenge(token);
} else {
// postpone revoking the challenge until we finish processing the current HIDL call.
mRevokeChallengePending = true;
return Status.OK;
}
mHandler.post(() -> {
// TODO(b/137106905): Schedule binder calls in FaceService to avoid deadlocks.
if (getCurrentClient() == null) {
// if we aren't handling any other HIDL calls (mCurrentClient == null), revoke
// the challenge right away.
startRevokeChallenge(token);
} else {
// postpone revoking the challenge until we finish processing the current HIDL
// call.
mRevokeChallengePending = true;
}
});
return Status.OK;
}
@Override // Binder call