diff options
| author | 2016-09-30 19:01:38 +0000 | |
|---|---|---|
| committer | 2016-09-30 19:01:38 +0000 | |
| commit | 456edab6e571203ea0eb4de04b4953d51893425a (patch) | |
| tree | 71387ff5c3b9cf171ddbdb8d84472665085b0d95 | |
| parent | 67a94b83de1deb76f4e86ee9366616369fb4b7b4 (diff) | |
| parent | 0af8ddf6617064bc0b32432f194a0e7b447a8950 (diff) | |
Merge "Add config_carrier_wfc_ims_available to config.xml" am: d1d682e446 am: 4fe680f920
am: 0af8ddf661
Change-Id: I24c1eea9828a2f1c4e6008e7a79f7440b9df0b0b
| -rw-r--r-- | core/res/res/values/config.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 01d9a588571e..c3a5ff0e3f76 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2221,6 +2221,11 @@ <!-- Flag specifying whether WFC over IMS is available on device --> <bool name="config_device_wfc_ims_available">false</bool> + <!-- Flag specifying whether WFC over IMS should be available for carrier: independent of + carrier provisioning. If false: hard disabled. If true: then depends on carrier + provisioning, availability etc --> + <bool name="config_carrier_wfc_ims_available">false</bool> + <bool name="config_networkSamplingWakesDevice">true</bool> <string-array translatable="false" name="config_cdma_home_system" /> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index d15a122de3c8..7f093827204b 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2223,6 +2223,7 @@ <java-symbol type="bool" name="config_device_respects_hold_carrier_config" /> <java-symbol type="bool" name="config_carrier_vt_available" /> <java-symbol type="bool" name="config_device_wfc_ims_available" /> + <java-symbol type="bool" name="config_carrier_wfc_ims_available" /> <java-symbol type="attr" name="touchscreenBlocksFocus" /> <java-symbol type="layout" name="resolver_list_with_default" /> <java-symbol type="string" name="whichApplicationNamed" /> |