Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 19cd309f: Merge change 3017 into donut

Browse Source 
Merge commit '19cd309f9eccdf8454dc6e5076013588b7a170a3'

* commit '19cd309f9eccdf8454dc6e5076013588b7a170a3':
  Add the EAP related fields for WiFi configuration.
This commit is contained in:
Android (Google) Code Review
2009-06-05 21:18:02 -07:00
committed by The Android Open Source Project
parent a31fb7d1d2 19cd309f9e
commit 36d3ebb880
2 changed files with 179 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
services/java/com/android/server/WifiService.java
View File

@@ -1060,6 +1060,83 @@ public class WifiService extends IWifiManager.Stub {
break setVariables;
}
if ((config.eap != null) && !WifiNative.setNetworkVariableCommand(
netId,
WifiConfiguration.eapVarName,
config.eap)) {
if (DBG) {
Log.d(TAG, config.SSID + ": failed to set eap: "+
config.eap);
}
break setVariables;
}
if ((config.identity != null) && !WifiNative.setNetworkVariableCommand(
netId,
WifiConfiguration.identityVarName,
config.identity)) {
if (DBG) {
Log.d(TAG, config.SSID + ": failed to set identity: "+
config.identity);
}
break setVariables;
}
if ((config.anonymousIdentity != null) && !WifiNative.setNetworkVariableCommand(
netId,
WifiConfiguration.anonymousIdentityVarName,
config.anonymousIdentity)) {
if (DBG) {
Log.d(TAG, config.SSID + ": failed to set anonymousIdentity: "+
config.anonymousIdentity);
}
break setVariables;
}
if ((config.clientCert != null) && !WifiNative.setNetworkVariableCommand(
netId,
WifiConfiguration.clientCertVarName,
config.clientCert)) {
if (DBG) {
Log.d(TAG, config.SSID + ": failed to set clientCert: "+
config.clientCert);
}
break setVariables;
}
if ((config.caCert != null) && !WifiNative.setNetworkVariableCommand(
netId,
WifiConfiguration.caCertVarName,
config.caCert)) {
if (DBG) {
Log.d(TAG, config.SSID + ": failed to set caCert: "+
config.caCert);
}
break setVariables;
}
if ((config.privateKey != null) && !WifiNative.setNetworkVariableCommand(
netId,
WifiConfiguration.privateKeyVarName,
config.privateKey)) {
if (DBG) {
Log.d(TAG, config.SSID + ": failed to set privateKey: "+
config.privateKey);
}
break setVariables;
}
if ((config.privateKeyPasswd != null) && !WifiNative.setNetworkVariableCommand(
netId,
WifiConfiguration.privateKeyPasswdVarName,
config.privateKeyPasswd)) {
if (DBG) {
Log.d(TAG, config.SSID + ": failed to set privateKeyPasswd: "+
config.privateKeyPasswd);
}
break setVariables;
}
return netId;
}