From 786e4f7d2305df509b90cd9e00a562c4c7c8501c Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Fri, 30 Sep 2016 09:43:49 -0700
Subject: [PATCH] Add config_carrier_wfc_ims_available to config.xml

The migration of this config to CarrierConfig breaks the build on
certain devices, so we should leave the original config in.

Bug: 29873049
Change-Id: I2f526c37198359de7adec4cfd4c391ccaa8ab0be
---
 core/res/res/values/config.xml  | 5 +++++
 core/res/res/values/symbols.xml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 51a5704c7f0bc..f909695610119 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2157,6 +2157,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 72e5078ac55e9..9a394373059a8 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2195,6 +2195,7 @@
   <java-symbol type="bool" name="config_device_vt_available" />
   <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" />