OSDN Git Service

Expose captive portal urls for configuration
authorNiklas Lindgren <niklas.lindgren@sony.com>
Fri, 7 Dec 2018 10:08:04 +0000 (11:08 +0100)
committerRemi NGUYEN VAN <reminv@google.com>
Tue, 9 Apr 2019 01:23:53 +0000 (10:23 +0900)
commitafc5f9bd3d45dab2b3620887af64b645e4e3e69d
tree9e72fecb997c69bde2d47eabb52e9dbff7c92da6
parent43b75cad9eed2d8d12375316a51ed31b3af01400
Expose captive portal urls for configuration

Carriers in Mainland China need to customize certain captive portal
urls. The main issue is that google servers are not accessible in
Mainland China.

Added the following captive portal resources to be targeted for overlay.
- config_captive_portal_http_url
- config_captive_portal_https_url
- config_captive_portal_fallback_urls (string-array)
- config_captive_portal_fallback_probe_specs (string-array)

These values can be customized for e g diffent countries

Bug: 111819230
Test: atest FrameworksNetTests NetworkStackTests
Test: Add a product RRO that targets a specific country code,
insert a SIM card that matches that country code and check the log
what URL is used.
Change-Id: I38a294a5e14417f65e96e76235ea153c53c4d7cc
core/res/res/values/config.xml
core/res/res/values/symbols.xml
packages/NetworkStack/Android.bp
packages/NetworkStack/res/values/config.xml
packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java
packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java
services/core/java/com/android/server/ConnectivityService.java
services/net/java/android/net/shared/NetworkMonitorUtils.java