commit ce2a483015cff2448432711a5c355c1d017868d4
author Vivek Sekhar <vsekhar@codeaurora.org> Wed Mar 26 13:26:53 2014 -0700
committer Vivek Sekhar <vsekhar@codeaurora.org> Wed Mar 26 13:48:58 2014 -0700
tree 210679b4b74c6d870b46e00d0dee3652ad2d76a4
parent 791e96dae0d70636af4073b90e9b0dba28034f33

Fix miscellaneous issues in Browser

- Fixed missing handlers, provider, filters and
  activity removed during browser package name change.
- Use overlay to read search engines.

Change-Id: I673d30cf65affdf5ac2e8c633deba3cde14bfe26

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 27b3620..473845e 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -22,6 +22,8 @@
 import android.app.Dialog;
 import android.app.DownloadManager;
 import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.res.Resources;
 import android.content.ClipboardManager;
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -358,12 +360,8 @@
                 }
                 Tab t = null;
                 if (urlData.isEmpty()) {
-                    Object[] params  = { new String("persist.env.c.browser.resource"),
-                                 new String("default")};
-                    Class[] type = new Class[] {String.class, String.class};
-                    String browserRes = (String)ReflectHelper.invokeStaticMethod(
-                        "android.os.SystemProperties", "get",
-                        type, params);
+                    Resources res = mActivity.getResources();
+                    String browserRes = res.getString(R.string.config_carrier_resource);
                     if (browserRes.equals(
                             "cmcc")) {
                         t = openTab(OFFLINE_PAGE, false, true, true);

src/com/android/browser/search/SearchEngines.java

diff --git a/src/com/android/browser/search/SearchEngines.java b/src/com/android/browser/search/SearchEngines.java
index dff5f62..c840afc 100644
--- a/src/com/android/browser/search/SearchEngines.java
+++ b/src/com/android/browser/search/SearchEngines.java
@@ -39,11 +39,8 @@
         ArrayList<SearchEngineInfo> searchEngineInfos = new ArrayList<SearchEngineInfo>();
         Resources res = context.getResources();
         String[] searchEngines = res.getStringArray(R.array.search_engines);
-        Object[] params  = { new String("persist.env.c.browser.resource"),
-                                 new String("default")};
-        Class[] type = new Class[] {String.class, String.class};
-        String browserRes = (String)ReflectHelper.invokeStaticMethod(
-                                "android.os.SystemProperties","get", type, params);
+        // add for carrier feature - preset search engine
+        String browserRes = res.getString(R.string.config_carrier_resource);
         for (int i = 0; i < searchEngines.length; i++) {
             String name = searchEngines[i];
             if ("cmcc".equals(browserRes)) {