diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-05 10:19:54 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-05 10:19:54 +0000 |
| commit | 690ad8f473d0b596dbfc9a0c7b8d76adf8240c57 (patch) | |
| tree | e9f4cecf93e02884fa862441262148124178964c | |
| parent | 68ce14ffa144572a6f044b24dcd7ea0eb0c3be33 (diff) | |
| parent | 6fbf6cbedfab6737a8af0e6ba2cb9d05d80db5f7 (diff) | |
| download | base-690ad8f473d0b596dbfc9a0c7b8d76adf8240c57.tar.gz | |
Merge cherrypicks of [15981390, 15981677, 15981678, 15981679, 15981680, 15981894] into sc-d1-release
Change-Id: I966003b3721c2a357f2dff76bd0d6594e321075a
| -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"); } } |