From 390bf6e214178db6d8d6c0acae63eb83e6d4324f Mon Sep 17 00:00:00 2001
From: Hui Wu <huiwu@google.com>
Date: Tue, 15 Mar 2022 16:34:16 -0700
Subject: [PATCH] handle java.lang.NullPointerException

Bug: 210528288
Test: atest CtsPermission2TestCases
Change-Id: I12c644f12f78c7585022c781b744df94a0ee9004
---
 .../android/server/cloudsearch/CloudSearchPerUserService.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java
index 116c7391b3882..8e0e3959dd0e9 100644
--- a/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java
+++ b/services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java
@@ -107,6 +107,10 @@ public class CloudSearchPerUserService extends
     @GuardedBy("mLock")
     public void onSearchLocked(@NonNull SearchRequest searchRequest,
             @NonNull ICloudSearchManagerCallback callback) {
+        if (mRemoteComponentName == null) {
+            return;
+        }
+
         String filterList = searchRequest.getSearchConstraints().containsKey(
                 SearchRequest.CONSTRAINT_SEARCH_PROVIDER_FILTER)
                 ? searchRequest.getSearchConstraints().getString(