resolved conflicts for merge of 29bea61c to jb-dev-plus-aosp

Change-Id: If582e1fa99691b4e4182c3a9b148fcef5cad251e
2012-06-12 08:13:10 -07:00
parent 6e66823873 29bea61cac
commit 01cb25fdde
1 changed files with 6 additions and 0 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1540,6 +1540,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                            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);