diff options
| author | Wink Saville <wink@google.com> | 2013-07-01 22:36:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-01 22:36:48 +0000 |
| commit | 59046f40baa66d3f10761d8294a43f92feef5c2e (patch) | |
| tree | 39e6b3d59949961ff2cb33e8236a5243a95652bb /core/res | |
| parent | e9df511e2018eb6a296408d09e355c6f2c77ae59 (diff) | |
| parent | ab9321d13de29cf314e8a1774b592d1f1d7e94d8 (diff) | |
| download | frameworks_base-59046f40baa66d3f10761d8294a43f92feef5c2e.zip frameworks_base-59046f40baa66d3f10761d8294a43f92feef5c2e.tar.gz frameworks_base-59046f40baa66d3f10761d8294a43f92feef5c2e.tar.bz2 | |
Merge "Add checkMobileProvisioning to ConnectivityService." into jb-mr2-dev
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/config.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 4bd1c9b..4572f5b 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -772,6 +772,15 @@ <!-- IP address of the dns server to use if nobody else suggests one --> <string name="config_default_dns_server" translatable="false">8.8.8.8</string> + <!-- The default mobile provisioning url. Empty by default, maybe overridden by + an mcc/mnc specific config.xml --> + <string name="mobile_provisioning_url" translatable="false"></string> + + <!-- This url is used as the default url when redirection is detected. Any + should work as all url's get redirected. But maybe overridden by + if needed. --> + <string name="mobile_redirected_provisioning_url" translatable="false">http://google.com</string> + <!-- The default character set for GsmAlphabet --> <!-- Empty string means MBCS is not considered --> <string name="gsm_alphabet_default_charset" translatable="false"></string> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 3ecdc0c..b885d56 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -703,6 +703,8 @@ <java-symbol type="string" name="preposition_for_time" /> <java-symbol type="string" name="progress_erasing" /> <java-symbol type="string" name="progress_unmounting" /> + <java-symbol type="string" name="mobile_provisioning_url" /> + <java-symbol type="string" name="mobile_redirected_provisioning_url" /> <java-symbol type="string" name="reboot_safemode_confirm" /> <java-symbol type="string" name="reboot_safemode_title" /> <java-symbol type="string" name="relationTypeAssistant" /> |