From febab8c34d878a77aa14d14f67a8ef38a5601308 Mon Sep 17 00:00:00 2001
From: Ilya Matyukhin <ilyamaty@google.com>
Date: Mon, 28 Jun 2021 12:30:07 -0700
Subject: [PATCH] Fix NPE in *GenerateChallengeClient

Bug: 191989346
Bug: 191684201
Test: N/A
Change-Id: I72e59aa8756f44b332ed5b18e248871baae105ed
---
 .../sensors/face/aidl/FaceGenerateChallengeClient.java    | 8 +++++++-
 .../aidl/FingerprintGenerateChallengeClient.java          | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGenerateChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGenerateChallengeClient.java
index d76036bf432de..7cdeebb87fece 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGenerateChallengeClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceGenerateChallengeClient.java
@@ -52,7 +52,13 @@ public class FaceGenerateChallengeClient extends GenerateChallengeClient<ISessio
 
     void onChallengeGenerated(int sensorId, int userId, long challenge) {
         try {
-            getListener().onChallengeGenerated(sensorId, userId, challenge);
+            final ClientMonitorCallbackConverter listener = getListener();
+            if (listener == null) {
+                Slog.e(TAG, "Listener is null in onChallengeGenerated");
+                mCallback.onClientFinished(this, false /* success */);
+                return;
+            }
+            listener.onChallengeGenerated(sensorId, userId, challenge);
             mCallback.onClientFinished(this, true /* success */);
         } catch (RemoteException e) {
             Slog.e(TAG, "Unable to send challenge", e);
diff --git a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java
index 6d0148190a602..4f54f8ade7c00 100644
--- a/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintGenerateChallengeClient.java
@@ -53,7 +53,13 @@ class FingerprintGenerateChallengeClient extends GenerateChallengeClient<ISessio
 
     void onChallengeGenerated(int sensorId, int userId, long challenge) {
         try {
-            getListener().onChallengeGenerated(sensorId, userId, challenge);
+            final ClientMonitorCallbackConverter listener = getListener();
+            if (listener == null) {
+                Slog.e(TAG, "Listener is null in onChallengeGenerated");
+                mCallback.onClientFinished(this, false /* success */);
+                return;
+            }
+            listener.onChallengeGenerated(sensorId, userId, challenge);
             mCallback.onClientFinished(this, true /* success */);
         } catch (RemoteException e) {
             Slog.e(TAG, "Unable to send challenge", e);