diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2016-12-14 08:23:40 +0900 |
|---|---|---|
| committer | Hugo Benichi <hugobenichi@google.com> | 2017-01-05 12:12:50 +0900 |
| commit | 2c02197bdd12378c7b2f8ee4bcaa625b2c564ede (patch) | |
| tree | 9af728759413f5417bce4080c45f609fb7b3faf5 /core/java | |
| parent | 7f086e162b9000fd471f3450ae53fe1261f58993 (diff) | |
DO NOT MERGE Captive portals: login activity probes like NetworkMonitor
This patch changes CaptivePortalLoginActivity captive portal test to be
consistent with NetworkMonitor by:
- using Network.java to open the http connection.
- adding a UserAgent property to the request header.
Test: manually tested.
Bug: 32369183
(cherry picked from commit cdf3ba48ccef0f9c6ca8724c1c106df0dd725ad0)
Change-Id: I559eb0497475daad758ba3b3395225dcd0a27a57
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 51431ebfaf14..042481f1727e 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -223,6 +223,13 @@ public class ConnectivityManager { public static final String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL"; /** + * Key for passing a user agent string to the captive portal login activity. + * {@hide} + */ + public static final String EXTRA_CAPTIVE_PORTAL_USER_AGENT = + "android.net.extra.CAPTIVE_PORTAL_USER_AGENT"; + + /** * Broadcast action to indicate the change of data activity status * (idle or active) on a network in a recent period. * The network becomes active when data transmission is started, or |