Merge "Add null check before using mCallback"

2020-09-09 00:40:09 +00:00
parent aebe8ffa02 1e27ae7084
commit 98499b6d58
1 changed files with 5 additions and 1 deletions
--- 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 */);
+            }
        }
    }