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

Merge "Revert "Fix biometric context update problem."" into udc-qpr-dev

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-06 14:40:14 +00:00
committed by Android (Google) Code Review
parent 47e7d5c654 7e6060dc70
commit edb9322137
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java
View File

@@ -260,6 +260,14 @@ class FingerprintAuthenticationClient
final AidlSession session = getFreshDaemon();
final OperationContextExt opContext = getOperationContext();
final ICancellationSignal cancel;
if (session.hasContextMethods()) {
cancel = session.getSession().authenticateWithContext(
mOperationId, opContext.toAidlContext(getOptions()));
} else {
cancel = session.getSession().authenticate(mOperationId);
}
getBiometricContext().subscribe(opContext, ctx -> {
if (session.hasContextMethods()) {
try {
@@ -281,12 +289,7 @@ class FingerprintAuthenticationClient
mALSProbeCallback.getProbe().enable();
}
if (session.hasContextMethods()) {
return session.getSession().authenticateWithContext(
mOperationId, opContext.toAidlContext(getOptions()));
} else {
return session.getSession().authenticate(mOperationId);
}
return cancel;
}
@Override