diff options
author | Leon Scroggins III <scroggo@google.com> | 2010-09-17 10:28:38 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 10:28:38 -0700 |
commit | 36a055549042ea384ec0f8037369571885f21a50 (patch) | |
tree | 7ebe0b8ebb710510f1f221f4efcf24dad6e65d33 | |
parent | e680381839dee8d0ebdc6dd8cf882f66ea5c6c1a (diff) | |
parent | 06e1dcacbeeadc87a2b4d9fb2ca12d9c7f7fbea2 (diff) | |
download | packages_apps_Browser-36a055549042ea384ec0f8037369571885f21a50.zip packages_apps_Browser-36a055549042ea384ec0f8037369571885f21a50.tar.gz packages_apps_Browser-36a055549042ea384ec0f8037369571885f21a50.tar.bz2 |
am 06e1dcac: am 3130660e: Default to Google if global search provider not present.
Merge commit '06e1dcacbeeadc87a2b4d9fb2ca12d9c7f7fbea2' into gingerbread-plus-aosp
* commit '06e1dcacbeeadc87a2b4d9fb2ca12d9c7f7fbea2':
Default to Google if global search provider not present.
-rw-r--r-- | src/com/android/browser/BrowserSettings.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ class BrowserSettings extends Observable { 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()) { |