Merge "Hotspot 2.0 framework - add implementation" (26611efc) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -333,7 +333,7 @@ LOCAL_SRC_FILES += \
		telephony/java/com/android/internal/telephony/ISms.aidl \
		telephony/java/com/android/internal/telephony/IWapPushManager.aidl \
		wifi/java/android/net/wifi/IWifiManager.aidl \
		wifi/java/android/net/wifi/passpoint/IPasspointManager.aidl \
		wifi/java/android/net/wifi/passpoint/IWifiPasspointManager.aidl \
		wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
		wifi/java/android/net/wifi/IWifiScanner.aidl \
		packages/services/PacProcessor/com/android/net/IProxyService.aidl \

api/current.txt

+15 −98

Original line number	Diff line number	Diff line
		@@ -17029,9 +17029,11 @@ package android.net.wifi {
		}

		public static final class WifiEnterpriseConfig.Eap {
		field public static final int AKA = 5; // 0x5
		field public static final int NONE = -1; // 0xffffffff
		field public static final int PEAP = 0; // 0x0
		field public static final int PWD = 3; // 0x3
		field public static final int SIM = 4; // 0x4
		field public static final int TLS = 1; // 0x1
		field public static final int TTLS = 2; // 0x2
		}
		@@ -17427,108 +17429,23 @@ package android.net.wifi.p2p.nsd {

		package android.net.wifi.passpoint {

		public abstract interface IPasspointManager implements android.os.IInterface {
		method public abstract android.os.Messenger getMessenger() throws android.os.RemoteException;
		method public abstract int getPasspointState() throws android.os.RemoteException;
		}

		public class PasspointCredential implements android.os.Parcelable {
		ctor public PasspointCredential();
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		}

		public class PasspointInfo implements android.os.Parcelable {
		public class WifiPasspointCredential implements android.os.Parcelable {
		ctor public WifiPasspointCredential(java.lang.String, android.net.wifi.WifiEnterpriseConfig);
		method public int describeContents();
		method public java.lang.String getClientCertPath();
		method public int getEapMethod();
		method public java.lang.String getFqdn();
		method public java.lang.String getImsi();
		method public java.lang.String getRealm();
		method public java.lang.String getUserName();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int ANQP_CAPABILITY = 1; // 0x1
		field public static final int CELLULAR_NETWORK = 64; // 0x40
		field public static final int CONNECTION_CAPABILITY = 2048; // 0x800
		field public static final int DOMAIN_NAME = 128; // 0x80
		field public static final int HOTSPOT_CAPABILITY = 256; // 0x100
		field public static final int IP_ADDR_TYPE_AVAILABILITY = 16; // 0x10
		field public static final int NAI_REALM = 32; // 0x20
		field public static final int NETWORK_AUTH_TYPE = 4; // 0x4
		field public static final int OPERATOR_FRIENDLY_NAME = 512; // 0x200
		field public static final int OSU_PROVIDER = 4096; // 0x1000
		field public static final int PRESET_ALL = 8191; // 0x1fff
		field public static final int PRESET_CRED_MATCH = 481; // 0x1e1
		field public static final int ROAMING_CONSORTIUM = 8; // 0x8
		field public static final int VENUE_NAME = 2; // 0x2
		field public static final int WAN_METRICS = 1024; // 0x400
		field public java.lang.String bssid;
		field public java.lang.String cellularNetwork;
		field public java.lang.String connectionCapability;
		field public java.lang.String domainName;
		field public java.lang.String ipAddrTypeAvaibility;
		field public java.lang.String naiRealm;
		field public java.lang.String networkAuthType;
		field public java.lang.String operatorFriendlyName;
		field public java.util.List osuProviderList;
		field public java.lang.String roamingConsortium;
		field public java.lang.String venueName;
		field public java.lang.String wanMetrics;
		}

		public class PasspointManager {
		ctor public PasspointManager(android.content.Context, android.net.wifi.passpoint.IPasspointManager);
		method public boolean addCredential(android.net.wifi.passpoint.PasspointCredential);
		method public void connect(android.net.wifi.passpoint.PasspointPolicy);
		method public int getPasspointState();
		method public java.util.List<android.net.wifi.passpoint.PasspointCredential> getSavedCredentials();
		method public android.net.wifi.passpoint.PasspointManager.Channel initialize(android.content.Context, android.os.Looper, android.net.wifi.passpoint.PasspointManager.ChannelListener);
		method public boolean removeCredential(android.net.wifi.passpoint.PasspointCredential);
		method public java.util.List<android.net.wifi.passpoint.PasspointPolicy> requestCredentialMatch(java.util.List<android.net.wifi.ScanResult>);
		method public void requestOsuIcons(android.net.wifi.passpoint.PasspointManager.Channel, java.util.List<android.net.wifi.passpoint.PasspointOsuProvider>, int, android.net.wifi.passpoint.PasspointManager.ActionListener);
		method public boolean updateCredential(android.net.wifi.passpoint.PasspointCredential);
		field public static final int BUSY = 2; // 0x2
		field public static final int ERROR = 0; // 0x0
		field public static final java.lang.String PASSPOINT_CRED_CHANGED_ACTION = "android.net.wifi.passpoint.CRED_CHANGE";
		field public static final int PASSPOINT_STATE_ACCESS = 3; // 0x3
		field public static final java.lang.String PASSPOINT_STATE_CHANGED_ACTION = "android.net.wifi.passpoint.STATE_CHANGE";
		field public static final int PASSPOINT_STATE_DISABLED = 1; // 0x1
		field public static final int PASSPOINT_STATE_DISCOVERY = 2; // 0x2
		field public static final int PASSPOINT_STATE_PROVISION = 4; // 0x4
		field public static final int PASSPOINT_STATE_UNKNOWN = 0; // 0x0
		field public static final int WIFI_DISABLED = 1; // 0x1
		}

		public static abstract interface PasspointManager.ActionListener {
		method public abstract void onFailure(int);
		method public abstract void onSuccess();
		}

		public static class PasspointManager.Channel {
		}

		public static abstract interface PasspointManager.ChannelListener {
		method public abstract void onChannelDisconnected();
		}

		public class PasspointOsuProvider implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static final int OSU_METHOD_OMADM = 0; // 0x0
		field public static final int OSU_METHOD_SOAP = 1; // 0x1
		field public static final int OSU_METHOD_UNKNOWN = -1; // 0xffffffff
		field public java.lang.String friendlyName;
		field public java.lang.Object icon;
		field public java.lang.String iconFileName;
		field public int iconHeight;
		field public java.lang.String iconType;
		field public int iconWidth;
		field public int osuMethod;
		field public java.lang.String osuNai;
		field public java.lang.String osuService;
		field public java.lang.String serverUri;
		field public java.lang.String ssid;
		}

		public class PasspointPolicy implements android.os.Parcelable {
		ctor public PasspointPolicy();
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		public class WifiPasspointManager {
		method public boolean addCredential(android.net.wifi.passpoint.WifiPasspointCredential);
		method public java.util.List<android.net.wifi.passpoint.WifiPasspointCredential> getSavedCredentials();
		method public boolean removeCredential(android.net.wifi.passpoint.WifiPasspointCredential);
		method public boolean updateCredential(android.net.wifi.passpoint.WifiPasspointCredential);
		}

		}

core/java/android/app/ContextImpl.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -81,8 +81,8 @@ import android.net.nsd.INsdManager;
		import android.net.nsd.NsdManager;
		import android.net.wifi.IWifiManager;
		import android.net.wifi.WifiManager;
		import android.net.wifi.passpoint.IPasspointManager;
		import android.net.wifi.passpoint.PasspointManager;
		import android.net.wifi.passpoint.IWifiPasspointManager;
		import android.net.wifi.passpoint.WifiPasspointManager;
		import android.net.wifi.p2p.IWifiP2pManager;
		import android.net.wifi.p2p.WifiP2pManager;
		import android.nfc.NfcManager;
		@@ -581,8 +581,8 @@ class ContextImpl extends Context {
		registerService(WIFI_PASSPOINT_SERVICE, new ServiceFetcher() {
		public Object createService(ContextImpl ctx) {
		IBinder b = ServiceManager.getService(WIFI_PASSPOINT_SERVICE);
		IPasspointManager service = IPasspointManager.Stub.asInterface(b);
		return new PasspointManager(ctx.getOuterContext(), service);
		IWifiPasspointManager service = IWifiPasspointManager.Stub.asInterface(b);
		return new WifiPasspointManager(ctx.getOuterContext(), service);
		}});

		registerService(WIFI_P2P_SERVICE, new ServiceFetcher() {

core/java/android/content/Context.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2352,11 +2352,11 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService} to retrieve a {@link
		* android.net.wifi.passpoint.PasspointManager} for handling management of
		* android.net.wifi.passpoint.WifiPasspointManager} for handling management of
		* Wi-Fi passpoint access.
		*
		* @see #getSystemService
		* @see android.net.wifi.passpoint.PasspointManager
		* @see android.net.wifi.passpoint.WifiPasspointManager
		*/
		public static final String WIFI_PASSPOINT_SERVICE = "wifipasspoint";

wifi/java/android/net/wifi/ScanResult.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -16,8 +16,8 @@

		package android.net.wifi;

		import android.net.wifi.passpoint.PasspointInfo;
		import android.net.wifi.passpoint.PasspointManager;
		import android.net.wifi.passpoint.WifiPasspointInfo;
		import android.net.wifi.passpoint.WifiPasspointManager;
		import android.os.Parcelable;
		import android.os.Parcel;

		@@ -80,10 +80,10 @@ public class ScanResult implements Parcelable {

		/**
		* Passpoint ANQP information. This is not fetched automatically.
		* Use {@link PasspointManager#requestAnqpInfo} to request ANQP info.
		* Use {@link WifiPasspointManager#requestAnqpInfo} to request ANQP info.
		* {@hide}
		*/
		public PasspointInfo passpoint;
		public WifiPasspointInfo passpoint;

		/**
		* {@hide}
		@@ -132,7 +132,7 @@ public class ScanResult implements Parcelable {
		distanceSdCm = source.distanceSdCm;
		seen = source.seen;
		if (source.passpoint != null)
		passpoint = new PasspointInfo(source.passpoint);
		passpoint = new WifiPasspointInfo(source.passpoint);
		}
		}

		@@ -219,7 +219,7 @@ public class ScanResult implements Parcelable {
		in.readInt()
		);
		if (in.readInt() == 1) {
		sr.passpoint = PasspointInfo.CREATOR.createFromParcel(in);
		sr.passpoint = WifiPasspointInfo.CREATOR.createFromParcel(in);
		}
		return sr;
		}