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 032e267212
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
This commit is contained in:
Jan Nordqvist
2015-09-22 15:54:32 -07:00
committed by Randy Pan
parent c1bde19a5e
commit 6e0af2ced5

View File

@@ -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.