From 174c74fe4bfdeced2827127cadde91dfb521c0ac Mon Sep 17 00:00:00 2001
From: Diya Bera <diyab@google.com>
Date: Fri, 4 Nov 2022 18:24:17 +0000
Subject: [PATCH] Adding a null checker

Fixes: 257357979
Fixes: 257134941
Test: N/A
Change-Id: I03de3b123d5db5fa9555479548dde17732aca3af
---
 .../com/android/server/biometrics/sensors/face/aidl/Sensor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java
index 0f5cdc3e1cf80..0d30ddd56699f 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/Sensor.java
@@ -637,7 +637,7 @@ public class Sensor {
 
     public void onBinderDied() {
         final BaseClientMonitor client = mScheduler.getCurrentClient();
-        if (client.isInterruptable()) {
+        if (client != null && client.isInterruptable()) {
             Slog.e(mTag, "Sending ERROR_HW_UNAVAILABLE for client: " + client);
             final ErrorConsumer errorConsumer = (ErrorConsumer) client;
             errorConsumer.onError(FaceManager.FACE_ERROR_HW_UNAVAILABLE,