From 205da0e27dee45b6325308833da74f315214175e Mon Sep 17 00:00:00 2001
From: Joshua Mccloskey <joshmccloskey@google.com>
Date: Thu, 17 Jun 2021 10:49:43 -0700
Subject: [PATCH] Fix NPE in FaceDetectClient

Test: N/A
Fixes: 190810158
Change-Id: I951c81117cd0adae4570a32f8389e6651d14ea6d
---
 .../sensors/face/aidl/FaceDetectClient.java          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java
index 0ba731ee8b4b0..cb966e7b47a96 100644
--- a/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java
+++ b/services/core/java/com/android/server/biometrics/sensors/face/aidl/FaceDetectClient.java
@@ -59,11 +59,13 @@ public class FaceDetectClient extends AcquisitionClient<ISession> implements Det
 
     @Override
     protected void stopHalOperation() {
-        try {
-            mCancellationSignal.cancel();
-        } catch (RemoteException e) {
-            Slog.e(TAG, "Remote exception", e);
-            mCallback.onClientFinished(this, false /* success */);
+        if (mCancellationSignal != null) {
+            try {
+                mCancellationSignal.cancel();
+            } catch (RemoteException e) {
+                Slog.e(TAG, "Remote exception", e);
+                mCallback.onClientFinished(this, false /* success */);
+            }
         }
     }