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(