diff --git a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java index 8e0e3959dd0e9..2eae6af771fc7 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