summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2013-06-29 21:10:57 -0700
committerWink Saville <wink@google.com>2013-06-29 21:10:57 -0700
commitab9321d13de29cf314e8a1774b592d1f1d7e94d8 (patch)
tree3ddf662a65410572a2d0634252212a383e7f840f /core/res
parent99e4a0f576bad57782b31f1b3329a3d2408f42ae (diff)
downloadframeworks_base-ab9321d13de29cf314e8a1774b592d1f1d7e94d8.zip
frameworks_base-ab9321d13de29cf314e8a1774b592d1f1d7e94d8.tar.gz
frameworks_base-ab9321d13de29cf314e8a1774b592d1f1d7e94d8.tar.bz2
Add checkMobileProvisioning to ConnectivityService.
Bug: 9279964 Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/config.xml9
-rw-r--r--core/res/res/values/symbols.xml2
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" />