Address comment in 23137 - protect against null.android-sdk-tools_r2android-sdk-1.6_r1android-sdk-1.6-docs_r1android-1.6_r1.5android-1.6_r1.4android-1.6_r1.3android-1.6_r1.2android-1.6_r1.1android-1.6_r1donut-release2

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/globalsearch/SuggestionSources.java b/src/com/android/globalsearch/SuggestionSources.java
index 3bf70e4..1c1e499 100644
--- a/src/com/android/globalsearch/SuggestionSources.java
+++ b/src/com/android/globalsearch/SuggestionSources.java
@@ -218,11 +218,17 @@ public class SuggestionSources implements SourceLookup {
     }
 
     private void loadTrustedPackages() {
+        mTrustedPackages = new HashSet<String>();
+
         // Get the list of trusted packages from a resource, which allows vendor overlays.
         String[] trustedPackages = mContext.getResources().getStringArray(
                 R.array.trusted_search_providers);
         
-        mTrustedPackages = new HashSet<String>();
+        if (trustedPackages == null) {
+            Log.w(TAG, "Could not load list of trusted search providers, trusting none");
+            return;
+        }
+        
         for (String trustedPackage : trustedPackages) {
             mTrustedPackages.add(trustedPackage);
         }