Merge "Add null check before using mCallback"

1 files changed, 5 insertions, 1 deletions

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 73fc17aa26f1..9898d7676178 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<T> extends ClientMonitor<T> 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 */);
+            }
         }
     }