summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2014-11-12 00:05:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-12 00:05:20 +0000
commit2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4 (patch)
treef85361dc5a6f553de6cd8ab246d1af8461118a26 /packages/SettingsProvider
parent9114a845d9474bc2ecc807c3f195fe0c5314556c (diff)
parentbbdc1c0e044a505d5a200963319a683e4ef1f967 (diff)
downloadframeworks_base-2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4.zip
frameworks_base-2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4.tar.gz
frameworks_base-2eb5a5f727d4692b70b68cb4b1b7e31bf74f13a4.tar.bz2
Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index ddf24e8..1771eac 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2614,6 +2614,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
// Set default cdma call auto retry
loadSetting(stmt, Settings.Global.CALL_AUTO_RETRY, 0);
+ // Set default simplified carrier network settings to 0
+ loadSetting(stmt, Settings.Global.HIDE_CARRIER_NETWORK_SETTINGS, 0);
+
// Set the preferred network mode to target desired value or Default
// value defined in RILConstants
int type;