diff options
| author | Jack Yu <jackyu@google.com> | 2016-04-08 17:10:50 -0700 |
|---|---|---|
| committer | Jack Yu <jackyu@google.com> | 2016-04-08 17:10:50 -0700 |
| commit | bdaaf0cc628dfcb82efd98afb6d1a8b4624ab23a (patch) | |
| tree | d917239b531b6facf04d12870ac01f093c614a63 | |
| parent | 022e9ca61f651feab1315787a90f76cfe29b2bc4 (diff) | |
| download | android_packages_apps_CarrierConfig-bdaaf0cc628dfcb82efd98afb6d1a8b4624ab23a.tar.gz android_packages_apps_CarrierConfig-bdaaf0cc628dfcb82efd98afb6d1a8b4624ab23a.tar.bz2 android_packages_apps_CarrierConfig-bdaaf0cc628dfcb82efd98afb6d1a8b4624ab23a.zip | |
Moved ERI configuration files from resoures to Carrier Config.
Used Carrier Config to load correct ERI configuration file since
there are MCC/MNC shared by different carriers.
bug: 23887558
Change-Id: I6431b76a79a59bf5d573231d8833fdb0befd1a70
| -rw-r--r-- | assets/carrier_config_20404.xml | 1 | ||||
| -rw-r--r-- | assets/carrier_config_310004.xml | 1 | ||||
| -rw-r--r-- | assets/carrier_config_310120.xml | 1 | ||||
| -rw-r--r-- | assets/carrier_config_311480.xml | 1 | ||||
| -rw-r--r-- | assets/carrier_config_311490.xml | 1 | ||||
| -rw-r--r-- | assets/carrier_config_311870.xml | 1 | ||||
| -rw-r--r-- | assets/carrier_config_312530.xml | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml index dc0feb8..d993eb0 100644 --- a/assets/carrier_config_20404.xml +++ b/assets/carrier_config_20404.xml @@ -8,5 +8,6 @@ <carrier_config gid1="BAE0000000000000"> <boolean name="allow_adding_apns_bool" value="false" /> <boolean name="broadcast_emergency_call_state_changes_bool" value="true" /> + <string name="carrier_eri_file_name_string">eri_311480.xml</string> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml index fba514e..71a87fb 100644 --- a/assets/carrier_config_310004.xml +++ b/assets/carrier_config_310004.xml @@ -26,5 +26,6 @@ <boolean name="enableMultipartSMS" value="true" /> <boolean name="allow_adding_apns_bool" value="false" /> <boolean name="broadcast_emergency_call_state_changes_bool" value="true" /> + <string name="carrier_eri_file_name_string">eri_311480.xml</string> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_310120.xml b/assets/carrier_config_310120.xml index c10bd5b..433e052 100644 --- a/assets/carrier_config_310120.xml +++ b/assets/carrier_config_310120.xml @@ -26,5 +26,6 @@ <boolean name="enabledMMS" value="true" /> <boolean name="enableMultipartSMS" value="true" /> <boolean name="allow_non_emergency_calls_in_ecm_bool" value="false" /> +<string name="carrier_eri_file_name_string">eri_310120.xml</string> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml index 314c993..82babea 100644 --- a/assets/carrier_config_311480.xml +++ b/assets/carrier_config_311480.xml @@ -31,5 +31,6 @@ <boolean name="enableMultipartSMS" value="true" /> <boolean name="allow_adding_apns_bool" value="false" /> <boolean name="broadcast_emergency_call_state_changes_bool" value="true" /> + <string name="carrier_eri_file_name_string">eri_311480.xml</string> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_311490.xml b/assets/carrier_config_311490.xml index db470d6..eefd4eb 100644 --- a/assets/carrier_config_311490.xml +++ b/assets/carrier_config_311490.xml @@ -20,5 +20,6 @@ <boolean name="enabledMMS" value="true" /> <boolean name="enableMultipartSMS" value="true" /> <boolean name="allow_non_emergency_calls_in_ecm_bool" value="false" /> +<string name="carrier_eri_file_name_string">eri_311490.xml</string> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_311870.xml b/assets/carrier_config_311870.xml index 60a62f4..468a409 100644 --- a/assets/carrier_config_311870.xml +++ b/assets/carrier_config_311870.xml @@ -17,5 +17,6 @@ <int name="maxImageWidth" value="2592" /> <boolean name="enabledMMS" value="true" /> <boolean name="enableMultipartSMS" value="true" /> +<string name="carrier_eri_file_name_string">eri_311870.xml</string> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_312530.xml b/assets/carrier_config_312530.xml index 60a62f4..46a9d0c 100644 --- a/assets/carrier_config_312530.xml +++ b/assets/carrier_config_312530.xml @@ -17,5 +17,6 @@ <int name="maxImageWidth" value="2592" /> <boolean name="enabledMMS" value="true" /> <boolean name="enableMultipartSMS" value="true" /> +<string name="carrier_eri_file_name_string">eri_310120.xml</string> </carrier_config> </carrier_config_list> |