summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2014-12-11 18:43:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-11 18:43:38 +0000
commitcac8662943b28663fefc6e5315a7b9acd514bfdb (patch)
tree2cb52a4e353fd29bd35c805ec46c175aa34b3a11
parent6f9a71729f6ba7521ed8461ec8b556a8907743b1 (diff)
parentc5da1d3ddfb4e0a8c17ee827765ba5ab7293c500 (diff)
downloadframeworks_base-cac8662943b28663fefc6e5315a7b9acd514bfdb.zip
frameworks_base-cac8662943b28663fefc6e5315a7b9acd514bfdb.tar.gz
frameworks_base-cac8662943b28663fefc6e5315a7b9acd514bfdb.tar.bz2
am c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev
* commit 'c5da1d3ddfb4e0a8c17ee827765ba5ab7293c500': Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
-rwxr-xr-xcore/res/res/values/config.xml4
-rwxr-xr-xcore/res/res/values/symbols.xml1
2 files changed, 4 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index ecc8d9d..48e512d 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1975,7 +1975,9 @@
<!-- An array of CDMA roaming indicators which means international roaming -->
<integer-array translatable="false" name="config_cdma_international_roaming_indicators" />
-
<!-- set the system language as value of EF LI/EF PL -->
<bool name="config_use_sim_language_file">true</bool>
+
+ <!-- Use ERI text for network name on CDMA LTE -->
+ <bool name="config_LTE_eri_for_network_name">true</bool>
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index d8c5f2c..2dcf5bd 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2147,4 +2147,5 @@
<java-symbol type="string" name="kg_text_message_separator" />
<java-symbol type="bool" name="config_use_sim_language_file" />
+ <java-symbol type="bool" name="config_LTE_eri_for_network_name" />
</resources>