am f01f6b6d: Merge "Added support for customization of mobile data setting."

* commit 'f01f6b6d379c911a2c1e350bc758cea26bfe6d9d': Added support for customization of mobile data setting.
2012-06-12 08:04:53 -07:00
parent e1b573a32b f01f6b6d37
commit 29bea61cac
1 changed files with 7 additions and 1 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1460,7 +1460,13 @@ public class DatabaseHelper extends SQLiteOpenHelper {
                    "true".equalsIgnoreCase(
                            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);