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

Merge "Fixed NPE in FingerprintAuthClient" into sc-dev

Browse Source
This commit is contained in:
Joshua Mccloskey
2021-10-04 23:10:30 +00:00
committed by Android (Google) Code Review
parent f093f0d0dc b5997d47ae
commit ec8c7fcf03
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,13 +164,17 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp
@Override @Override
protected void stopHalOperation() { protected void stopHalOperation() {
UdfpsHelper.hideUdfpsOverlay(getSensorId(), mUdfpsOverlayController); UdfpsHelper.hideUdfpsOverlay(getSensorId(), mUdfpsOverlayController);
try { if (mCancellationSignal != null) {
mCancellationSignal.cancel(); try {
} catch (RemoteException e) { mCancellationSignal.cancel();
Slog.e(TAG, "Remote exception", e); } catch (RemoteException e) {
onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_HW_UNAVAILABLE, Slog.e(TAG, "Remote exception", e);
0 /* vendorCode */); onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_HW_UNAVAILABLE,
mCallback.onClientFinished(this, false /* success */); 0 /* vendorCode */);
mCallback.onClientFinished(this, false /* success */);
}
} else {
Slog.e(TAG, "cancellation signal was null");
} }
} }