summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2019-04-12 05:54:46 -0700
committerLorenzo Colitti <lorenzo@google.com>2019-04-18 13:30:00 +0000
commite11b373642029d778924c79cc951fec11eaf3c90 (patch)
tree59f768897416de5ab9dbbac6ef9a8a802ca6ceb4
parent978816cd44ae1ab8dd7e323c5dbb43e3f5f396a6 (diff)
Change the validation URL for Chinese SIMs
The default HTTPS and fallback validation URLs are not accessible from China, so users in China never get a validated network on WiFi with the default AOSP settings. OEMs selling devices targeting China typically change the check URLs for that reason. When the device uses a Chinese SIM card, change the default validation URLs to URLs accessible accessible from China as of now. Test: inserted China SIM, WiFi off/on, dumpsys network_stack shows new URL used Bug: 111819230 Change-Id: Ib7f41f470ef1a9c7712f2477ebfab44e915cf1b9 Merged-In: Ib7f41f470ef1a9c7712f2477ebfab44e915cf1b9 (cherry picked from commit 990ea84d2d60256d8c752a4a582de0f5a28932c9)
-rw-r--r--res/values-mcc460/config.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/res/values-mcc460/config.xml b/res/values-mcc460/config.xml
new file mode 100644
index 0000000..fd4a848
--- /dev/null
+++ b/res/values-mcc460/config.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!-- Network validation URL configuration for devices using a Chinese SIM (MCC 460).
+ The below URLs are often whitelisted by captive portals, so they should not be used in the
+ general case as this could degrade the user experience (portals not detected properly).
+ However in China the default URLs are not accessible in general. The below alternatives
+ should allow users to connect to local networks normally. -->
+ <string name="default_captive_portal_https_url" translatable="false">https://connectivitycheck.gstatic.com/generate_204</string>
+ <string-array name="default_captive_portal_fallback_urls" translatable="false">
+ <item>http://www.googleapis.cn/generate_204</item>
+ </string-array>
+</resources>