Merge "handle java.lang.NullPointerException" into tm-dev

2022-03-16 03:25:04 +00:00
parent c36d7e4faa 390bf6e214
commit 0cbab392ff
1 changed files with 4 additions and 0 deletions
--- 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(