From 6e0af2ced5366f8dcad49fa3810337ce923a2f41 Mon Sep 17 00:00:00 2001
From: Jan Nordqvist <jannq@google.com>
Date: Tue, 22 Sep 2015 15:54:32 -0700
Subject: [PATCH] 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 032e26721254cfdc2bdedbc592662730128807dd
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
---
 core/java/android/net/ConnectivityManager.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 4d9b759eea..ad9058f35d 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -208,6 +208,12 @@ public class ConnectivityManager {
      * {@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.