diff options
author | Chung-yih Wang <cywang@google.com> | 2009-06-03 17:33:47 +0800 |
---|---|---|
committer | Chung-yih Wang <cywang@google.com> | 2009-06-05 02:10:35 +0800 |
commit | 5069cc78497209c035a7019b2f407bd1ed57f64a (patch) | |
tree | 20bcbb43d3d3a5897297c31a8e584a3541057100 /services | |
parent | 641bb3d8dfd72f57356d39ef00256d6077c9e235 (diff) | |
download | frameworks_base-5069cc78497209c035a7019b2f407bd1ed57f64a.zip frameworks_base-5069cc78497209c035a7019b2f407bd1ed57f64a.tar.gz frameworks_base-5069cc78497209c035a7019b2f407bd1ed57f64a.tar.bz2 |
Add the EAP related fields for WiFi configuration.
-- added the EAP/802.1X related fields in WifiConfiguration for
supporting EAP/802.1X authentication.
-- hid the related fields for now.
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/WifiService.java | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 1528ba3..5df88b2 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -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; } |