From 1e27ae70846e2d9298f03882acac8078d6e8d7f1 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Tue, 8 Sep 2020 16:10:12 -0700 Subject: [PATCH] Add null check before using mCallback There's some strange cases where onErrorInternal is being invoked but mCallback is null. However, currently we only have a stack trace. If this really is a problem, a bugreport will be needed. We can only fix the NPE for now. Fixes: 166187582 Test: Builds Change-Id: I8ea932aadb15757383f273b0f6232b379c6b9ae1 --- .../server/biometrics/sensors/AcquisitionClient.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java index 73fc17aa26f1d..9898d76761784 100644 --- a/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java +++ b/services/core/java/com/android/server/biometrics/sensors/AcquisitionClient.java @@ -98,7 +98,11 @@ public abstract class AcquisitionClient extends ClientMonitor implements I } if (finish) { - mCallback.onClientFinished(this, false /* success */); + if (mCallback == null) { + Slog.e(TAG, "Callback is null, perhaps the client hasn't been started yet?"); + } else { + mCallback.onClientFinished(this, false /* success */); + } } }