diff options
| author | Joshua Mccloskey <joshmccloskey@google.com> | 2021-09-13 12:24:02 -0700 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-05 10:19:34 +0000 |
| commit | 6fbf6cbedfab6737a8af0e6ba2cb9d05d80db5f7 (patch) | |
| tree | e9f4cecf93e02884fa862441262148124178964c | |
| parent | 68ce14ffa144572a6f044b24dcd7ea0eb0c3be33 (diff) | |
| download | base-6fbf6cbedfab6737a8af0e6ba2cb9d05d80db5f7.tar.gz | |
Fixed NPE in FingerprintAuthClient
Test: It builds.
Bug: 193883067
Change-Id: I3c310ab6a631750377a069e926567279bedc9d3b
Merged-In: I3c310ab6a631750377a069e926567279bedc9d3b
(cherry picked from commit 78893c23173aea599c3cadd6a4ab7506ae3919ac)
DO NOT MERGE
(cherry picked from commit b5997d47aef24642c86120d8cb6190434561978f)
| -rw-r--r-- | services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java index 37ee76adeece..4400834efb3f 100644 --- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintAuthenticationClient.java @@ -164,13 +164,17 @@ class FingerprintAuthenticationClient extends AuthenticationClient<ISession> imp @Override protected void stopHalOperation() { UdfpsHelper.hideUdfpsOverlay(getSensorId(), mUdfpsOverlayController); - try { - mCancellationSignal.cancel(); - } catch (RemoteException e) { - Slog.e(TAG, "Remote exception", e); - onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_HW_UNAVAILABLE, - 0 /* vendorCode */); - mCallback.onClientFinished(this, false /* success */); + if (mCancellationSignal != null) { + try { + mCancellationSignal.cancel(); + } catch (RemoteException e) { + Slog.e(TAG, "Remote exception", e); + onError(BiometricFingerprintConstants.FINGERPRINT_ERROR_HW_UNAVAILABLE, + 0 /* vendorCode */); + mCallback.onClientFinished(this, false /* success */); + } + } else { + Slog.e(TAG, "cancellation signal was null"); } } |