summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-06-12 07:48:52 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-06-12 07:48:53 -0700
commitf01f6b6d379c911a2c1e350bc758cea26bfe6d9d (patch)
tree23eba6ec65576bbecd4362d15d34f13ce5194793
parentb4151b296fbeb39a367bb9930d605180d683ca11 (diff)
parent44030b7864b0e703f5a2760d698761ce6312814f (diff)
downloadframeworks_base-f01f6b6d379c911a2c1e350bc758cea26bfe6d9d.zip
frameworks_base-f01f6b6d379c911a2c1e350bc758cea26bfe6d9d.tar.gz
frameworks_base-f01f6b6d379c911a2c1e350bc758cea26bfe6d9d.tar.bz2
Merge "Added support for customization of mobile data setting."
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index a5e3483..56fe106 100644
--- 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);