summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2015-05-14 00:06:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-14 00:07:10 +0000
commit5703ef5bf85f4810b1c0958bd1c45603af055db7 (patch)
treef6637c288614d63aed6dbf9cd6d3bbc14e8d567c /core
parent3ac457420a2833e8a86f8a8aa372e81e0843c887 (diff)
parent8c621ef54630e411d50e9ba1d8d8ed19ef93f9e1 (diff)
downloadframeworks_base-5703ef5bf85f4810b1c0958bd1c45603af055db7.zip
frameworks_base-5703ef5bf85f4810b1c0958bd1c45603af055db7.tar.gz
frameworks_base-5703ef5bf85f4810b1c0958bd1c45603af055db7.tar.bz2
Merge "Add support for static RadioCapabilities." into mnc-dev
Diffstat (limited to 'core')
-rwxr-xr-xcore/res/res/values/config.xml7
-rwxr-xr-xcore/res/res/values/symbols.xml1
2 files changed, 8 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 690fd28..84e4ca9 100755
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2144,4 +2144,11 @@
<!-- Whether device supports double tap to wake -->
<bool name="config_supportDoubleTapWake">false</bool>
+
+ <!-- The RadioAccessFamilies supported by the device.
+ Empty is viewed as "all". Only used on devices which
+ don't support RIL_REQUEST_GET_RADIO_CAPABILITY
+ format is UMTS|LTE|... -->
+ <string translatable="false" name="config_radio_access_family"></string>
+
</resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index cc25885..0d306c6 100755
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2276,4 +2276,5 @@
<java-symbol type="id" name="target_badge" />
<java-symbol type="bool" name="config_supportDoubleTapWake" />
<java-symbol type="drawable" name="ic_perm_device_info" />
+ <java-symbol type="string" name="config_radio_access_family" />
</resources>