commit 7d9a18eeb684e87da5a907c96d25da21918119b5
author Jeff Brown <jeffbrown@google.com> Tue Jun 12 12:37:42 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 12 12:37:42 2012 -0700
tree 9c74ba8e52846dc1c00eb3c0be389e4b52f8b17e
parent 01cb25fddeb03d72585ae13a8a1f1721f4bcef8c
parent f195b80c2b8d40211cd91665fc9d2f62ad47f91d

Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index b0939de..bcd0add 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1540,6 +1540,12 @@
                             SystemProperties.get("ro.com.android.dataroaming",
                                     "false")) ? 1 : 0);
 
+            // Mobile Data default, based on build
+            loadSetting(stmt, Settings.Secure.MOBILE_DATA,
+                    "true".equalsIgnoreCase(
+                            SystemProperties.get("ro.com.android.mobiledata",
+                                    "true")) ? 1 : 0);
+
             loadBooleanSetting(stmt, Settings.Secure.INSTALL_NON_MARKET_APPS,
                     R.bool.def_install_non_market_apps);