commit 5dbd59feb22428eb91ba0de9134644a32c130d5f
author Jan Nordqvist <jannq@google.com> Tue Sep 22 15:54:32 2015 -0700
committer Randy Pan <zpan@google.com> Thu Dec 10 16:06:50 2015 -0800
tree f35ed9bf460513b113ffe5df52cb6817f510d2e9
parent 84376d950f3d58d1ef33d80d19b87b0031315783

DO NOT MERGE Hotspot 2.0 relase 2 first cut.

CP mods to take a URL as a parameter, and new ScanInfo object.

Cherry-picked from 0f3b4449b073ef8ff3157c890eaf306f28b93585
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 4d9b759..ad9058f 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -208,6 +208,12 @@
      * {@link android.content.Intent#getParcelableExtra(String)}.
      */
     public static final String EXTRA_CAPTIVE_PORTAL = "android.net.extra.CAPTIVE_PORTAL";
+
+    /**
+     * Key for passing a URL to the captive portal login activity.
+     */
+    public static final String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL";
+
     /**
      * Broadcast action to indicate the change of data activity status
      * (idle or active) on a network in a recent period.