commit 6f4f82a18dbf9e4a6f9afad1990c22fb6ae13880
author Vivek Sekhar <vsekhar@codeaurora.org> Fri Mar 21 19:24:51 2014 -0700
committer Vivek Sekhar <vsekhar@codeaurora.org> Tue Mar 25 11:05:48 2014 -0700
tree 17ef2c6a4953ea3620a9dfd79fd1da32d320f6e9
parent 41242f2ff13293612786e7550a934ee13d5f6b50

Use android overlay for carrier configuration

- Modified browser to use android overlay logic for carrier
  configuration changes.

Change-Id: I32f0364c0cad246c7f84c55c348eec629f5f0295

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 90dcc4f..8bbe7b9 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -137,16 +137,15 @@
 
     // add for carrier feature
     private static Context sResPackageCtx;
-    private android.os.CountDownTimer mCountDownTimer;
 
     //Determine if WebView is Initialized or not
     private boolean mWebViewInitialized;
 
-    public static void initialize(final Context context) {    	
+    public static void initialize(final Context context) {
         sInstance = new BrowserSettings(context);
     }
 
-    public static BrowserSettings getInstance() {    	
+    public static BrowserSettings getInstance() {
         return sInstance;
     }
 
@@ -254,11 +253,7 @@
             }
 
             // add for carrier homepage feature
-            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);
+            String browserRes = mContext.getResources().getString(R.string.config_carrier_resource);
             if ("cu".equals(browserRes) || "cmcc".equals(browserRes)) {
                 int resID = sResPackageCtx.getResources().getIdentifier(
                         "homepage_base", "string", "com.android.browser.res");