diff options
| author | Junda Liu <junda@google.com> | 2016-12-16 17:05:40 -0800 |
|---|---|---|
| committer | Junda Liu <junda@google.com> | 2016-12-16 17:05:40 -0800 |
| commit | 8254e07143303a81c07c7ac3c78ba86244431051 (patch) | |
| tree | 8f913e9fadfa7fd19465968c5b31ee85fa02705a | |
| parent | 66f9ffbe4a89eb82b332e510762bd0849933813d (diff) | |
| parent | 6edbb5e7ccf59fa10829611e53ac5a03127cca30 (diff) | |
| download | android_packages_apps_CarrierConfig-8254e07143303a81c07c7ac3c78ba86244431051.tar.gz android_packages_apps_CarrierConfig-8254e07143303a81c07c7ac3c78ba86244431051.tar.bz2 android_packages_apps_CarrierConfig-8254e07143303a81c07c7ac3c78ba86244431051.zip | |
resolve merge conflicts of 6edbb5e to nyc-mr2-dev-plus-aosp
Change-Id: I6888a6432b7aae2c46db4fb5a5fe2f81c906314d
| -rw-r--r-- | assets/carrier_config_50501.xml | 1 | ||||
| -rw-r--r-- | assets/carrier_config_50511.xml | 5 | ||||
| -rw-r--r-- | assets/carrier_config_50571.xml | 4 | ||||
| -rw-r--r-- | assets/carrier_config_50572.xml | 5 |
4 files changed, 15 insertions, 0 deletions
diff --git a/assets/carrier_config_50501.xml b/assets/carrier_config_50501.xml index cb19b7c..f0bc6b9 100644 --- a/assets/carrier_config_50501.xml +++ b/assets/carrier_config_50501.xml @@ -6,5 +6,6 @@ <int name="maxImageWidth" value="2592" /> <string name="default_vm_number_string">+61101</string> <int name="carrier_default_wfc_ims_mode_int" value="1" /> + <boolean name="editable_tether_apn_bool" value="true" /> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_50511.xml b/assets/carrier_config_50511.xml index 941de9c..f0bc6b9 100644 --- a/assets/carrier_config_50511.xml +++ b/assets/carrier_config_50511.xml @@ -1,6 +1,11 @@ <?xml version='1.0' encoding='utf-8' standalone='yes' ?> <carrier_config_list> <carrier_config> + <int name="maxImageHeight" value="1944" /> + <int name="maxMessageSize" value="2097152" /> + <int name="maxImageWidth" value="2592" /> <string name="default_vm_number_string">+61101</string> + <int name="carrier_default_wfc_ims_mode_int" value="1" /> + <boolean name="editable_tether_apn_bool" value="true" /> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_50571.xml b/assets/carrier_config_50571.xml index 5483a00..f0bc6b9 100644 --- a/assets/carrier_config_50571.xml +++ b/assets/carrier_config_50571.xml @@ -1,7 +1,11 @@ <?xml version='1.0' encoding='utf-8' standalone='yes' ?> <carrier_config_list> <carrier_config> + <int name="maxImageHeight" value="1944" /> + <int name="maxMessageSize" value="2097152" /> + <int name="maxImageWidth" value="2592" /> <string name="default_vm_number_string">+61101</string> <int name="carrier_default_wfc_ims_mode_int" value="1" /> + <boolean name="editable_tether_apn_bool" value="true" /> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_50572.xml b/assets/carrier_config_50572.xml index 5483a00..a2f0d1f 100644 --- a/assets/carrier_config_50572.xml +++ b/assets/carrier_config_50572.xml @@ -1,7 +1,12 @@ <?xml version='1.0' encoding='utf-8' standalone='yes' ?> <carrier_config_list> <carrier_config> + <int name="maxImageHeight" value="1944" /> + <int name="maxMessageSize" value="2097152" /> + <int name="maxImageWidth" value="2592" /> <string name="default_vm_number_string">+61101</string> <int name="carrier_default_wfc_ims_mode_int" value="1" /> + <boolean name="editable_tether_apn_bool" value="true" /> </carrier_config> </carrier_config_list> + |