commit 06e1dcacbeeadc87a2b4d9fb2ca12d9c7f7fbea2
author Leon Scroggins III <scroggo@google.com> Fri Sep 17 10:11:54 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 17 10:11:54 2010 -0700
tree 50ab8429041be6dd508706a108eb498dbd6ce7c1
parent a9e35b6e3101fafb07e6bb4282e7dfc4dcfdc193
parent 3130660e0045923199c74efa7c1df9ea85501dce

am 3130660e: Default to Google if global search provider not present.

Merge commit '3130660e0045923199c74efa7c1df9ea85501dce' into gingerbread

* commit '3130660e0045923199c74efa7c1df9ea85501dce':
  Default to Google if global search provider not present.

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 58b66ee..56d3b6f 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -314,7 +314,8 @@
 
         homeUrl =
             p.getString(PREF_HOMEPAGE, homeUrl);
-        String searchEngineName = p.getString(PREF_SEARCH_ENGINE, null);
+        String searchEngineName = p.getString(PREF_SEARCH_ENGINE,
+                SearchEngine.GOOGLE);
         if (searchEngine == null || !searchEngine.getName().equals(searchEngineName)) {
             if (searchEngine != null) {
                 if (searchEngine.supportsVoiceSearch()) {