Add the phase2 field for EAP WiFi configuration. (b96ea206) · Commits · e / os / android_frameworks_base

services/java/com/android/server/WifiService.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -1075,6 +1075,17 @@ public class WifiService extends IWifiManager.Stub {
		break setVariables;
		}

		if ((config.phase2 != null) && !WifiNative.setNetworkVariableCommand(
		netId,
		WifiConfiguration.phase2VarName,
		config.phase2)) {
		if (DBG) {
		Log.d(TAG, config.SSID + ": failed to set phase2: "+
		config.phase2);
		}
		break setVariables;
		}

		if ((config.identity != null) && !WifiNative.setNetworkVariableCommand(
		netId,
		WifiConfiguration.identityVarName,

wifi/java/android/net/wifi/WifiConfiguration.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ public class WifiConfiguration implements Parcelable {
		/** {@hide} */
		public static final String eapVarName = "eap";
		/** {@hide} */
		public static final String phase2VarName = "phase2";
		/** {@hide} */
		public static final String identityVarName = "identity";
		/** {@hide} */
		public static final String anonymousIdentityVarName = "anonymous_identity";
		@@ -272,6 +274,11 @@ public class WifiConfiguration implements Parcelable {
		* {@hide}
		*/
		public String eap;
		/**
		* The phase2 authenication could be PAP, MSCHAP, MSCHAP2, GTC.
		* {@hide}
		*/
		public String phase2;
		/**
		* The identity of the user in string,
		* which is used for the authentication.
		@@ -314,6 +321,7 @@ public class WifiConfiguration implements Parcelable {
		for (int i = 0; i < wepKeys.length; i++)
		wepKeys[i] = null;
		eap = null;
		phase2 = null;
		identity = null;
		anonymousIdentity = null;
		password = null;
		@@ -399,6 +407,10 @@ public class WifiConfiguration implements Parcelable {
		if (this.eap != null) {
		sbuf.append(eap);
		}
		sbuf.append('\n').append(" phase2: ");
		if (this.phase2 != null) {
		sbuf.append(phase2);
		}
		sbuf.append('\n').append(" Identity: ");
		if (this.identity != null) {
		sbuf.append(identity);
		@@ -486,6 +498,7 @@ public class WifiConfiguration implements Parcelable {
		writeBitSet(dest, allowedPairwiseCiphers);
		writeBitSet(dest, allowedGroupCiphers);
		dest.writeString(eap);
		dest.writeString(phase2);
		dest.writeString(identity);
		dest.writeString(anonymousIdentity);
		dest.writeString(password);
		@@ -516,6 +529,7 @@ public class WifiConfiguration implements Parcelable {
		config.allowedPairwiseCiphers = readBitSet(in);
		config.allowedGroupCiphers = readBitSet(in);
		config.eap = in.readString();
		config.phase2 = in.readString();
		config.identity = in.readString();
		config.anonymousIdentity = in.readString();
		config.password = in.readString();