summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Zhamaitsiak <pavelz@google.com>2014-12-09 20:17:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-09 20:17:26 +0000
commitbf7b4d9489a10dd1ed39175c55abafc3bef9c2a9 (patch)
treeadbe0d7353f50bed1cd3f5c1b73ee634b63b2311
parent1e989df50d3435c47c8685caabb463ec34f59840 (diff)
parentf996d6b7ffcfa813727ba57a30903d1f9e2666da (diff)
downloadframeworks_base-bf7b4d9489a10dd1ed39175c55abafc3bef9c2a9.zip
frameworks_base-bf7b4d9489a10dd1ed39175c55abafc3bef9c2a9.tar.gz
frameworks_base-bf7b4d9489a10dd1ed39175c55abafc3bef9c2a9.tar.bz2
am f996d6b7: Merge "Added configuration to determine whether VoLTE requires provisioning." into lmp-mr1-dev
* commit 'f996d6b7ffcfa813727ba57a30903d1f9e2666da': Added configuration to determine whether VoLTE requires provisioning.
-rwxr-xr-xcore/res/res/values/config.xml3
-rwxr-xr-xcore/res/res/values/symbols.xml1
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index d0c612d..6769c85 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1830,6 +1830,9 @@
provisioning, availability etc -->
<bool name="config_carrier_volte_available">false</bool>
+ <!-- Flag specifying whether VoLTE availability is based on provisioning -->
+ <bool name="config_carrier_volte_provisioned">false</bool>
+
<!-- Flag specifying whether VT is available on device -->
<bool name="config_device_vt_available">false</bool>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 9845096..4f2ed22 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2079,6 +2079,7 @@
<java-symbol type="bool" name="imsServiceAllowTurnOff" />
<java-symbol type="bool" name="config_device_volte_available" />
<java-symbol type="bool" name="config_carrier_volte_available" />
+ <java-symbol type="bool" name="config_carrier_volte_provisioned" />
<java-symbol type="bool" name="config_device_vt_available" />
<java-symbol type="bool" name="config_carrier_vt_available" />
<java-symbol type="bool" name="useImsAlwaysForEmergencyCall" />