From 687c38332a552c28d366cc839012d5f5ba6e6779 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Thu, 14 May 2020 16:24:18 -0700
Subject: [PATCH] Add null pointer check for addLockoutResetCallback

Fixes: 155988975

Test: Follow steps in comment#3, no system_server crash
Change-Id: Ie138286efe5c08ddc98cc74a034558ec43d5cf35
---
 .../com/android/server/biometrics/BiometricServiceBase.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
index 808f8c21cc8de..5a6ab4e594245 100644
--- a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
+++ b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
@@ -978,6 +978,10 @@ public abstract class BiometricServiceBase extends SystemService
     }
 
     protected void addLockoutResetCallback(IBiometricServiceLockoutResetCallback callback) {
+        if (callback == null) {
+            Slog.w(getTag(), "Null LockoutResetCallback");
+            return;
+        }
         mHandler.post(() -> {
            final LockoutResetMonitor monitor = new LockoutResetMonitor(callback);
            if (!mLockoutMonitors.contains(monitor)) {