diff options
| author | Yuhao Zheng <yuhaozheng@google.com> | 2013-10-04 00:14:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-04 00:14:18 +0000 |
| commit | f3ca947784571a554ef862e0e8ba01eff3cfa004 (patch) | |
| tree | 153e44b70d69bf0b3d9219f62f5b3afcbc2f3a1a /core | |
| parent | 76a5c86df7902870c87ff07ffd0628cb10f32c00 (diff) | |
| parent | d2078bc8c927af17c367bc53b198ad3787b2ff72 (diff) | |
| download | frameworks_base-f3ca947784571a554ef862e0e8ba01eff3cfa004.zip frameworks_base-f3ca947784571a554ef862e0e8ba01eff3cfa004.tar.gz frameworks_base-f3ca947784571a554ef862e0e8ba01eff3cfa004.tar.bz2 | |
Merge "New Telephony APIs to return MMS UA and UAProfUrl" into klp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/config.xml | 6 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index e39fd2a..1ddf201 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -961,6 +961,12 @@ If false, Content-disposition fragments are ignored --> <bool name="config_mms_content_disposition_support">true</bool> + <!-- MMS user agent string --> + <string name="config_mms_user_agent" translatable="false"></string> + + <!-- MMS user agent prolfile url --> + <string name="config_mms_user_agent_profile_url" translatable="false"></string> + <!-- National Language Identifier codes for the following two config items. (from 3GPP TS 23.038 V9.1.1 Table 6.2.1.2.4.1): 0 - reserved diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index d483fe0..a541995 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -469,6 +469,8 @@ <java-symbol type="string" name="chooseActivity" /> <java-symbol type="string" name="config_default_dns_server" /> <java-symbol type="string" name="config_ethernet_iface_regex" /> + <java-symbol type="string" name="config_mms_user_agent" /> + <java-symbol type="string" name="config_mms_user_agent_profile_url" /> <java-symbol type="string" name="config_ntpServer" /> <java-symbol type="string" name="config_tether_apndata" /> <java-symbol type="string" name="config_useragentprofile_url" /> |