commit 8ab8d5c74e643a8b3fd4a854163820f163fdd389
author Remi NGUYEN VAN <reminv@google.com> Wed May 23 14:26:39 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 23 14:26:39 2018 +0000
tree 00a9fe025e60acc458f32e363efa5a3a4fd2d35f
parent de0d35a2295b50ebfeacb32c882c881df67c2172
parent c2491572d549ef47f8e52054590eaea5a16fe021

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

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index c3b8f39..c5cb1f5 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -238,6 +238,14 @@
     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}
      */