summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorJunda Liu <junda@google.com>2015-06-16 23:18:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-16 23:18:50 +0000
commit25acdffa23be41c4e49021153983d67e9fa48e38 (patch)
tree04d8a1ce441a384b2f5849cd920be3c0985708b2 /packages/SettingsProvider
parenta09ee4a6a60080611ef31f16ecb9195da9ae3709 (diff)
parenta11ffa64366e39899bcda7448e5b5ffe727bea48 (diff)
downloadframeworks_base-25acdffa23be41c4e49021153983d67e9fa48e38.zip
frameworks_base-25acdffa23be41c4e49021153983d67e9fa48e38.tar.gz
frameworks_base-25acdffa23be41c4e49021153983d67e9fa48e38.tar.bz2
am a11ffa64: Merge "Remove hide_carrier_network_settings from Settings." into mnc-dev
* commit 'a11ffa64366e39899bcda7448e5b5ffe727bea48': Remove hide_carrier_network_settings from Settings.
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 7bf2223..5a14967 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2682,9 +2682,6 @@ 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;