commit eb3e8bc028c49be4b7e885714343845d6b98b6fb
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 06 01:14:55 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 06 01:14:54 2013 -0700
tree c64c8bcf2c403a32003922901a17ca58a8192211
parent 5599bb9090989165c55534bd3b33c70843c04554
parent 08f9e2b17b7ca5c1878803dd457d6879fce6f4d8

Merge "Browser: add homepage and bookmark feature"

src/com/android/browser/BrowserSettings.java

diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index b6ccfe5..8d2d7b0 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);
             }
         }