Merge "Update Hotspot 2.0 SDK APIs" (b9707090) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −5

Original line number	Diff line number	Diff line
		@@ -17526,13 +17526,10 @@ package android.net.wifi.passpoint {
		public class WifiPasspointCredential implements android.os.Parcelable {
		ctor public WifiPasspointCredential(java.lang.String, java.lang.String, android.net.wifi.WifiEnterpriseConfig);
		method public int describeContents();
		method public java.lang.String getCaRootCertPath();
		method public java.lang.String getClientCertPath();
		method public int getEapMethod();
		method public android.net.wifi.WifiEnterpriseConfig getEnterpriseConfig();
		method public java.lang.String getFqdn();
		method public java.lang.String getRealm();
		method public java.lang.String getUserName();
		method public void setCredential(android.net.wifi.WifiEnterpriseConfig);
		method public void setEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);
		method public void setFqdn(java.lang.String);
		method public void setRealm(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);

wifi/java/android/net/wifi/passpoint/WifiPasspointCredential.java

+20 −28

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ public class WifiPasspointCredential implements Parcelable {
		private String mCredentialName;
		private String mUpdateIdentifier;
		private String mSubscriptionUpdateMethod;
		private WifiEnterpriseConfig mEnterpriseConfig;
		private String mType;
		private String mInnerMethod;
		private String mCertType;
		@@ -93,17 +94,15 @@ public class WifiPasspointCredential implements Parcelable {
		* Constructor
		* @param realm Realm of the passpoint credential
		* @param fqdn Fully qualified domain name (FQDN) of the credential
		* @param config Credential information, must be either EAP-TLS or EAP-TTLS
		* @param config Enterprise config, must be either EAP-TLS or EAP-TTLS
		* @see WifiEnterpriseConfig
		*/
		public WifiPasspointCredential(String realm, String fqdn, WifiEnterpriseConfig config) {
		mRealm = realm;
		switch (config.getEapMethod()) {
		case WifiEnterpriseConfig.Eap.TLS:
		// TODO;
		break;
		case WifiEnterpriseConfig.Eap.TTLS:
		// TODO;
		mEnterpriseConfig = new WifiEnterpriseConfig(config);
		break;
		default:
		// ignore
		@@ -299,11 +298,21 @@ public class WifiPasspointCredential implements Parcelable {
		}

		/**
		* Get EAP method of this Passpoint credential.
		* @return EAP method, refer to {@link WifiEnterpriseConfig.Eap} for possible return values
		* Get enterprise config of this Passpoint credential.
		* @return Enterprise config
		* @see WifiEnterpriseConfig
		*/
		public int getEapMethod() {
		return 0;
		public WifiEnterpriseConfig getEnterpriseConfig() {
		return new WifiEnterpriseConfig(mEnterpriseConfig);
		}

		/**
		* Set enterprise config of this Passpoint credential.
		* @param config Enterprise config, must be either EAP-TLS or EAP-TTLS
		* @see WifiEnterpriseConfig
		*/
		public void setEnterpriseConfig(WifiEnterpriseConfig config) {
		// TODO
		}

		/** @hide */
		@@ -316,10 +325,7 @@ public class WifiPasspointCredential implements Parcelable {
		return mCertSha256Fingerprint;
		}

		/**
		* Get the user name of this Passpoint credential, for EAP-TTLS only.
		* @return user name
		*/
		/** @hide */
		public String getUserName() {
		return mUsername;
		}
		@@ -345,30 +351,16 @@ public class WifiPasspointCredential implements Parcelable {
		return mMnc;
		}

		/**
		* Get the CA root certificate path of this Passpoint credential.
		* @return CA root certificate path
		*/
		/** @hide */
		public String getCaRootCertPath() {
		return mCaRootCert;
		}

		/**
		* Get the client certificate path of this Passpoint credential, for EAP-TLS only.
		* @return client certificate path
		*/
		/** @hide */
		public String getClientCertPath() {
		return mClientCert;
		}

		/**
		* Set credential information of this Passpoint credential.
		* @param config Credential information, must be either EAP-TLS or EAP-TTLS
		*/
		public void setCredential(WifiEnterpriseConfig config) {
		// TODO
		}

		/**
		* Get the realm of this Passpoint credential.
		* @return Realm