Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java |
index a48eea848cdd77a554d82408ec4a1e7adeeac058..a2040f06b578262415f7e66613fb54c6eb97d9a4 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/SearchEngineAdapter.java |
@@ -129,7 +129,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On |
@Override |
public int getCount() { |
- return mSearchEngines.size(); |
+ return mSearchEngines == null ? 0 : mSearchEngines.size(); |
} |
@Override |
@@ -222,6 +222,7 @@ public class SearchEngineAdapter extends BaseAdapter implements LoadListener, On |
public void onTemplateUrlServiceLoaded() { |
TemplateUrlService.getInstance().unregisterLoadListener(this); |
initEntries(); |
+ notifyDataSetChanged(); |
} |
// OnClickListener: |