Merge "Add config_carrier_wfc_ims_available to config.xml" am: d1d682e446 am: 4fe680f...

am: 456edab6e5

Change-Id: I2339f2d669aaa756f26d0843bf1a3c85cb7a9656

diff --cc core/res/res/values/config.xml
index 3ae6186,c3a5ff0..85838ed
--- 1/core/res/res/values/config.xml
--- 2/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@@ -2232,8 -2219,13 +2232,13 @@@
      <bool name="config_carrier_vt_available">false</bool>
  
      <!-- Flag specifying whether WFC over IMS is available on device -->
 -    <bool name="config_device_wfc_ims_available">false</bool>
 +        <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 --cc core/res/res/values/symbols.xml
Simple merge