Check if a searchable is null before adding it to the list of searchables
for web search. If getActivityMetaData returned null for a web search
searchable, previously, this null would get added to the list of searchables
for web search, which was causing GlobalSearch's SearchSettings to crash
with an NPE (which I've guarded against in change 6602).
diff --git a/core/java/android/server/search/Searchables.java b/core/java/android/server/search/Searchables.java
index b959907..c615957 100644
--- a/core/java/android/server/search/Searchables.java
+++ b/core/java/android/server/search/Searchables.java
@@ -247,7 +247,12 @@
for (int i = 0; i < webSearchInfoList.size(); ++i) {
ActivityInfo ai = webSearchInfoList.get(i).activityInfo;
ComponentName component = new ComponentName(ai.packageName, ai.name);
- newSearchablesForWebSearchList.add(newSearchablesMap.get(component));
+ SearchableInfo searchable = newSearchablesMap.get(component);
+ if (searchable == null) {
+ Log.w(LOG_TAG, "did not find component in searchables: " + component);
+ } else {
+ newSearchablesForWebSearchList.add(searchable);
+ }
}
}
