handle java.lang.NullPointerException

Bug: 228541646 Test: atest Change-Id: I9958d14b71cdd2e2c5e1108e57e75b31a86ee95a
2022-04-07 21:43:21 -07:00
parent be460cbac4
commit fee94b5f5a
1 changed files with 3 additions and 1 deletions
--- 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