From fee94b5f5a83bc7e1550469a63beda59b7a9e9dc Mon Sep 17 00:00:00 2001
From: Hui Wu <huiwu@google.com>
Date: Thu, 7 Apr 2022 21:43:21 -0700
Subject: handle java.lang.NullPointerException

Bug: 228541646
Test: atest
Change-Id: I9958d14b71cdd2e2c5e1108e57e75b31a86ee95a
---
 .../com/android/server/cloudsearch/CloudSearchPerUserService.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java
index 8e0e3959dd0e..2eae6af771fc 100644
--- a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java
+++ b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java
@@ -197,7 +197,9 @@ public class CloudSearchPerUserService extends
             Slog.d(TAG, "onDestroyLocked(): requestId=" + requestId);
         }
         final CloudSearchCallbackInfo sessionInfo = mCallbackQueue.removeElement(requestId);
-        sessionInfo.destroy();
+        if (sessionInfo != null) {
+            sessionInfo.destroy();
+        }
     }
 
     @Override
-- 
cgit v1.2.3-59-g8ed1b