Merge "Add null check before using mCallback" am: 98499b6d58

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12541018 Change-Id: I43e94d42281b322f9f02907af5b9b684c0a19d46
2020-09-09 00:42:59 +00:00
parent 42084a5c98 98499b6d58
commit 2e7ffb2360
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 */);
+            }
        }
    }