Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00af1a86 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 8440ecce: Merge change 6668 into donut 

Merge commit '8440ecce'

* commit '8440ecce':
  Check if a searchable is null before adding it to the list of searchables
parents d8980134 8440ecce

core/java/android/server/search/Searchables.java

+6 −1
Original line number Diff line number Diff line
@@ -247,7 +247,12 @@ public class Searchables { 
            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);

                }

            }

        }