Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e37ac4b authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge changes I84461d40,Ib3ab9105 into qt-dev 

am: 3fe30fa71b

Change-Id: Ief0b029527ec71a6744ba2b6a72751e8a5b2bf98
parents 62b5a3f2 027bf790

res/values/overlayable.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
    <overlayable name="NetworkStackConfig">

        <policy type="product|system|vendor">

            <!-- 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_https_url"/>

            <item type="array" name="config_captive_portal_fallback_urls"/>