Merge "Hotspot 2.0 relase 2 first cut." (ca309393) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -483,6 +483,7 @@ aidl_files := \
		frameworks/base/wifi/java/android/net/wifi/p2p/nsd/WifiP2pServiceInfo.aidl \
		frameworks/base/wifi/java/android/net/wifi/WpsInfo.aidl \
		frameworks/base/wifi/java/android/net/wifi/ScanResult.aidl \
		frameworks/base/wifi/java/android/net/wifi/ScanInfo.aidl \
		frameworks/base/wifi/java/android/net/wifi/WifiEnterpriseConfig.aidl \
		frameworks/base/wifi/java/android/net/wifi/WifiConfiguration.aidl \
		frameworks/base/wifi/java/android/net/wifi/WifiInfo.aidl \

api/current.txt

+19 −0

Original line number	Diff line number	Diff line
		@@ -18251,6 +18251,7 @@ package android.net {
		field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
		field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1
		field public static final java.lang.String EXTRA_CAPTIVE_PORTAL = "android.net.extra.CAPTIVE_PORTAL";
		field public static final java.lang.String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL";
		field public static final java.lang.String EXTRA_EXTRA_INFO = "extraInfo";
		field public static final java.lang.String EXTRA_IS_FAILOVER = "isFailover";
		field public static final java.lang.String EXTRA_NETWORK = "android.net.extra.NETWORK";
		@@ -19157,6 +19158,22 @@ package android.net.sip {

		package android.net.wifi {

		public class ScanInfo implements android.os.Parcelable {
		ctor public ScanInfo(android.net.wifi.ScanResult);
		ctor public ScanInfo(long, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, byte[], int);
		method public int describeContents();
		method public long getBssid();
		method public byte[] getIconData();
		method public java.lang.String getIconType();
		method public java.lang.String getName();
		method public int getOsuIdentity();
		method public int getRssi();
		method public android.net.wifi.ScanResult getScanResult();
		method public java.lang.String getServiceDescription();
		method public java.lang.String getSsid();
		method public void writeToParcel(android.os.Parcel, int);
		}

		public class ScanResult implements android.os.Parcelable {
		method public int describeContents();
		method public boolean is80211mcResponder();
		@@ -19357,6 +19374,7 @@ package android.net.wifi {
		method public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
		method public android.net.wifi.WifiInfo getConnectionInfo();
		method public android.net.DhcpInfo getDhcpInfo();
		method public java.util.List<android.net.wifi.ScanInfo> getScanInfos();
		method public java.util.List<android.net.wifi.ScanResult> getScanResults();
		method public int getWifiState();
		method public boolean is5GHzBandSupported();
		@@ -19372,6 +19390,7 @@ package android.net.wifi {
		method public boolean reconnect();
		method public boolean removeNetwork(int);
		method public boolean saveConfiguration();
		method public void setOsuSelection(int);
		method public void setTdlsEnabled(java.net.InetAddress, boolean);
		method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
		method public boolean setWifiEnabled(boolean);

api/system-current.txt

+21 −2

Original line number	Diff line number	Diff line
		@@ -19763,6 +19763,7 @@ package android.net {
		field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
		field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1
		field public static final java.lang.String EXTRA_CAPTIVE_PORTAL = "android.net.extra.CAPTIVE_PORTAL";
		field public static final java.lang.String EXTRA_CAPTIVE_PORTAL_URL = "android.net.extra.CAPTIVE_PORTAL_URL";
		field public static final java.lang.String EXTRA_EXTRA_INFO = "extraInfo";
		field public static final java.lang.String EXTRA_IS_FAILOVER = "isFailover";
		field public static final java.lang.String EXTRA_NETWORK = "android.net.extra.NETWORK";
		@@ -20910,6 +20911,22 @@ package android.net.wifi {
		field public byte id;
		}

		public class ScanInfo implements android.os.Parcelable {
		ctor public ScanInfo(android.net.wifi.ScanResult);
		ctor public ScanInfo(long, int, java.lang.String, java.lang.String, java.lang.String, java.lang.String, byte[], int);
		method public int describeContents();
		method public long getBssid();
		method public byte[] getIconData();
		method public java.lang.String getIconType();
		method public java.lang.String getName();
		method public int getOsuIdentity();
		method public int getRssi();
		method public android.net.wifi.ScanResult getScanResult();
		method public java.lang.String getServiceDescription();
		method public java.lang.String getSsid();
		method public void writeToParcel(android.os.Parcel, int);
		}

		public class ScanResult implements android.os.Parcelable {
		method public int describeContents();
		method public boolean is80211mcResponder();
		@@ -21135,6 +21152,7 @@ package android.net.wifi {
		method public android.net.wifi.WifiConnectionStatistics getConnectionStatistics();
		method public android.net.DhcpInfo getDhcpInfo();
		method public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();
		method public java.util.List<android.net.wifi.ScanInfo> getScanInfos();
		method public java.util.List<android.net.wifi.ScanResult> getScanResults();
		method public int getWifiState();
		method public boolean is5GHzBandSupported();
		@@ -21154,6 +21172,7 @@ package android.net.wifi {
		method public boolean reconnect();
		method public boolean removeNetwork(int);
		method public boolean saveConfiguration();
		method public void setOsuSelection(int);
		method public void setTdlsEnabled(java.net.InetAddress, boolean);
		method public void setTdlsEnabledWithMacAddress(java.lang.String, boolean);
		method public boolean setWifiEnabled(boolean);
		@@ -25668,8 +25687,8 @@ package android.os {
		ctor public UserHandle(android.os.Parcel);
		method public int describeContents();
		method public int getIdentifier();
		method public final boolean isOwner();
		method public static final int myUserId();
		method public boolean isOwner();
		method public static int myUserId();
		method public static android.os.UserHandle readFromParcel(android.os.Parcel);
		method public void writeToParcel(android.os.Parcel, int);
		method public static void writeToParcel(android.os.UserHandle, android.os.Parcel);

core/java/android/net/ConnectivityManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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.

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -76,8 +76,9 @@ public class CaptivePortalLoginActivity extends Activity {
		String server = Settings.Global.getString(getContentResolver(), "captive_portal_server");
		if (server == null) server = DEFAULT_SERVER;
		mCm = ConnectivityManager.from(this);
		String url = getIntent().getStringExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL_URL);
		try {
		mURL = new URL("http", server, "/generate_204");
		mURL = url != null ? new URL(url) : new URL("http", server, "/generate_204");
		} catch (MalformedURLException e) {
		// System misconfigured, bail out in a way that at least provides network access.
		Log.e(TAG, "Invalid captive portal URL, server=" + server);