Merge changes from topic "presubmit-am-9dbd7e051cf943fc942deabc250323f4"

* changes: [automerge] handle java.lang.NullPointerException 2p: fee94b5f5a 2p: 13f117bd4f [automerge] handle java.lang.NullPointerException 2p: fee94b5f5a handle java.lang.NullPointerException
2022-04-08 17:16:44 +00:00
parent b3ffa8565a 4175a07e5c
commit db64a419a3
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