diff options
| -rw-r--r-- | services/java/com/android/server/WifiService.java | 11 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 14 |
2 files changed, 25 insertions, 0 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 67e8cf3..f25c221 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -888,6 +888,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, diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index eda2f2d..f85aadd 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -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"; @@ -273,6 +275,11 @@ public class WifiConfiguration implements Parcelable { */ 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. * {@hide} @@ -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(); |