diff options
author | Junda Liu <junda@google.com> | 2014-11-12 03:44:44 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 03:44:44 +0000 |
commit | 5b7dbca7ca3dc82dc6267eead409e5a2a876c8c5 (patch) | |
tree | a3a46051f580e695766565f2a08f226f41c1e1df /packages/SettingsProvider | |
parent | 46c84d87e7894cd675c2e81eb7090738ed127de1 (diff) | |
parent | 829519dfaab9f2c13492d97556a95300a6908ea4 (diff) | |
download | frameworks_base-5b7dbca7ca3dc82dc6267eead409e5a2a876c8c5.zip frameworks_base-5b7dbca7ca3dc82dc6267eead409e5a2a876c8c5.tar.gz frameworks_base-5b7dbca7ca3dc82dc6267eead409e5a2a876c8c5.tar.bz2 |
am 829519df: Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f automerge: 5716ebe
* commit '829519dfaab9f2c13492d97556a95300a6908ea4':
Add HIDE_CARRIER_NETWORK_SETTINGS global setting.
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 3 |
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; |