diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-07-20 00:57:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-07-20 00:57:52 +0000 |
| commit | d81d73d036706a9d856dbb62694ed8bd6f17cc06 (patch) | |
| tree | 102e4be8a3f919475e414507b2bbef6fb1c69e76 /assets | |
| parent | 8fb8803a152942b5e9965670a757282d64d4ee53 (diff) | |
| parent | cf4bb932179672174e63e78d4830bf913c8b8c86 (diff) | |
| download | android_packages_apps_CarrierConfig-d81d73d036706a9d856dbb62694ed8bd6f17cc06.tar.gz android_packages_apps_CarrierConfig-d81d73d036706a9d856dbb62694ed8bd6f17cc06.tar.bz2 android_packages_apps_CarrierConfig-d81d73d036706a9d856dbb62694ed8bd6f17cc06.zip | |
Merge "Made severe and extreme alert configuration dependency configurable" into nyc-mr1-dev
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/carrier_config_20404.xml | 1 | ||||
| -rw-r--r-- | assets/carrier_config_310004.xml | 1 | ||||
| -rw-r--r-- | assets/carrier_config_311480.xml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml index d58cf8b..d016325 100644 --- a/assets/carrier_config_20404.xml +++ b/assets/carrier_config_20404.xml @@ -11,5 +11,6 @@ <string name="carrier_eri_file_name_string">eri_311480.xml</string> <int name="carrier_default_wfc_ims_mode_int" value="1"/> <boolean name="editable_wfc_mode_bool" value="false"/> + <boolean name="disable_severe_when_extreme_disabled_bool" value="false" /> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml index f89727e..7d82bf7 100644 --- a/assets/carrier_config_310004.xml +++ b/assets/carrier_config_310004.xml @@ -29,5 +29,6 @@ <string name="carrier_eri_file_name_string">eri_311480.xml</string> <int name="carrier_default_wfc_ims_mode_int" value="1"/> <boolean name="editable_wfc_mode_bool" value="false"/> + <boolean name="disable_severe_when_extreme_disabled_bool" value="false" /> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml index 7842292..4b00a37 100644 --- a/assets/carrier_config_311480.xml +++ b/assets/carrier_config_311480.xml @@ -48,5 +48,6 @@ <item value="501|another device sent all devices busy response|1404" /> <item value="1014|call has been pulled by another device|1016" /> </string-array> + <boolean name="disable_severe_when_extreme_disabled_bool" value="false" /> </carrier_config> </carrier_config_list> |