Merge "Add configurable captive portal probes" into pi-dev

am: 8ab8d5c74e Change-Id: Iec7a74bbf2569a91e958c497200d77e8451cbf7b
2018-05-23 15:22:24 -07:00
parent e32feea342 8ab8d5c74e
commit b2d7efe619
1 changed files with 8 additions and 0 deletions
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -237,6 +237,14 @@ public class ConnectivityManager {
     */
    public static final String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL";

+    /**
+     * Key for passing a {@link android.net.captiveportal.CaptivePortalProbeSpec} to the captive
+     * portal login activity.
+     * {@hide}
+     */
+    public static final String EXTRA_CAPTIVE_PORTAL_PROBE_SPEC =
+            "android.net.extra.CAPTIVE_PORTAL_PROBE_SPEC";
+
    /**
     * Key for passing a user agent string to the captive portal login activity.
     * {@hide}