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

Merge "Fix biometric context update problem." into udc-qpr-dev am: 67e5d55046

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

Change-Id: I1fdf41dbbad737bd0bc0e22a109e502598b41a4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vincent Wang
2023-07-25 07:53:55 +00:00
committed by Automerger Merge Worker
parent ade5fd7315 67e5d55046
commit 4f95fe9506
1 changed files with 6 additions and 9 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,14 +260,6 @@ class FingerprintAuthenticationClient
final AidlSession session = getFreshDaemon(); final AidlSession session = getFreshDaemon();
final OperationContextExt opContext = getOperationContext(); 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 -> { getBiometricContext().subscribe(opContext, ctx -> {
if (session.hasContextMethods()) { if (session.hasContextMethods()) {
try { try {
@@ -289,7 +281,12 @@ class FingerprintAuthenticationClient
mALSProbeCallback.getProbe().enable(); mALSProbeCallback.getProbe().enable();
} }
return cancel; if (session.hasContextMethods()) {
return session.getSession().authenticateWithContext(
mOperationId, opContext.toAidlContext(getOptions()));
} else {
return session.getSession().authenticate(mOperationId);
}
} }
@Override @Override