summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChiachang Wang <chiachangwang@google.com>2020-05-08 02:48:41 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-08 02:48:41 +0000
commit6fa9f698ccf7f9b43ef288dda2b45643202dcc4b (patch)
tree185f73fa4ef2f89bc4ede27382561daf186a0322
parentf5850d8dd76ce3badecd190f6ef71d849d288c10 (diff)
parentefddbd1db6f0c34f425fde6cdc5816706859ace8 (diff)
Merge "Prevent using commas in url configurations" into rvc-dev am: 6ccbe373e6 am: efddbd1db6
Change-Id: I06068c7e76ad78244831a1ab715987a950af270a
-rw-r--r--res/values/config.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml
index 766a807..2ae71f3 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -35,6 +35,8 @@
<string name="config_captive_portal_http_url" translatable="false"></string>
<!--suppress CheckTagEmptyBody: overlayable resource to use as configuration hook -->
<string name="config_captive_portal_https_url" translatable="false"></string>
+ <!-- Literal commas are not allowed in the url configuration because they
+ are used as a separator internally. -->
<string-array name="config_captive_portal_fallback_urls" translatable="false">
</string-array>
<string-array name="config_captive_portal_fallback_probe_specs" translatable="false">