commit 18a1e1d1df382e1769609059a64a838544f7e8eb
author Leon Scroggins III <scroggo@google.com> Fri Sep 17 10:36:36 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 17 10:36:36 2010 -0700
tree 2aa8f34cd9362ee4995e2429dd293628ef6a8a9e
parent 88040bb3c3674d9233df51681ef88cf26bde1e84
parent 36a055549042ea384ec0f8037369571885f21a50

am 36a05554: am 06e1dcac: am 3130660e: Default to Google if global search provider not present.

Merge commit '36a055549042ea384ec0f8037369571885f21a50'

* commit '36a055549042ea384ec0f8037369571885f21a50':
  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 e748174..7d5bbf6 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -322,7 +322,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()) {