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

Merge "Fixed NPE in FingerprintAuthClient" into sc-v2-dev

Browse Source
This commit is contained in:
Joshua Mccloskey
2021-09-23 19:46:41 +00:00
committed by Android (Google) Code Review
parent 181e222687 e74c0ccecf
commit e90025458d
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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