commit 08f9e2b17b7ca5c1878803dd457d6879fce6f4d8
author kaiyiz <kaiyiz@codeaurora.org> Fri Aug 16 09:15:48 2013 +0800
committer kaiyiz <kaiyiz@codeaurora.org> Mon Aug 19 15:05:35 2013 +0800
tree 7564bcb23febc76dcd931369cba57789e2ed78f5
parent 950f627953b2bfedecf827e3e6c020b2cbb3dcd2

Browser: add homepage and bookmark feature

Add specified homepage and bookmarks for ChinaMobile.

CRs-Fixed: 530017

Change-Id: I48d78893a2580d8fe7a93b04095c754c2f608d53

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 0b415be..68c575a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -251,7 +251,7 @@
 
             // add for carrier homepage feature
             String browserRes = SystemProperties.get("persist.env.c.browser.resource", "default");
-            if ("cu".equals(browserRes)) {
+            if ("cu".equals(browserRes) || "cmcc".equals(browserRes)) {
                 int resID = sResPackageCtx.getResources().getIdentifier(
                         "homepage_base", "string", "com.android.browser.res");
                 sFactoryResetUrl = sResPackageCtx.getResources().getString(resID);

src/com/android/browser/provider/BrowserProvider2.java

diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index 9577af6..36ad0ce 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -654,10 +654,14 @@
             values.put(Bookmarks.DIRTY, true);
             db.insertOrThrow(TABLE_BOOKMARKS, null, values);
 
-            addDefaultBookmarks(db, FIXED_ID_ROOT);
             // add for carrier bookmark feature
             String browserRes = SystemProperties.get("persist.env.c.browser.resource", "default");
-            if ("ct".equals(browserRes)) {
+
+            //don't add default bookmarks for cmcc
+            if (!"cmcc".equals(browserRes)) {
+                addDefaultBookmarks(db, FIXED_ID_ROOT);
+            }
+            if ("ct".equals(browserRes) || "cmcc".equals(browserRes)) {
                 addDefaultCarrierBookmarks(db, FIXED_ID_ROOT);
             }
         }