Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I84461d40,Ib3ab9105 into qt-dev am: 3fe30fa71b

Browse Source 
am: b63abe5f0e

Change-Id: I55f63560154e23d5dd02ca9a80f744d18fa70794
This commit is contained in:
Lorenzo Colitti
2019-04-24 05:40:31 -07:00
committed by android-build-merger
parent 80aec91b46 b63abe5f0e
commit 2544512363
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/NetworkStack/res/values/overlayable.xml
View File

@@ -17,6 +17,7 @@
<overlayable name="NetworkStackConfig"> <overlayable name="NetworkStackConfig">
<policy type="product|system|vendor"> <policy type="product|system|vendor">
<!-- Configuration values for NetworkMonitor --> <!-- Configuration values for NetworkMonitor -->
<item type="integer" name="config_captive_portal_dns_probe_timeout"/>
<item type="string" name="config_captive_portal_http_url"/> <item type="string" name="config_captive_portal_http_url"/>
<item type="string" name="config_captive_portal_https_url"/> <item type="string" name="config_captive_portal_https_url"/>
<item type="array" name="config_captive_portal_fallback_urls"/> <item type="array" name="config_captive_portal_fallback_urls"/>