diff options
| author | Kenny Root <kroot@google.com> | 2012-05-11 15:49:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-11 15:49:31 -0700 |
| commit | 72a84b78d08d41d6e76767744d03d928e0aa26e1 (patch) | |
| tree | 03d5c42264f4c2ae68de9f79c719ac1a5dcbd17e | |
| parent | 411e7724c67a19d257b19c3a349ac7c3cf0eae3a (diff) | |
| parent | f543a71e7a1de8ca03a628237d6b22cc886b586a (diff) | |
| download | packages_apps_Settings-72a84b78d08d41d6e76767744d03d928e0aa26e1.zip packages_apps_Settings-72a84b78d08d41d6e76767744d03d928e0aa26e1.tar.gz packages_apps_Settings-72a84b78d08d41d6e76767744d03d928e0aa26e1.tar.bz2 | |
Merge "WiFi: only send engine setting when key_id is set" into jb-dev
| -rw-r--r-- | src/com/android/settings/wifi/WifiConfigController.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 45d070a..6bf4259 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -128,7 +128,7 @@ public class WifiConfigController implements TextWatcher, if (config == null) { return false; } - if (config.key_id.value() != null) { + if (!TextUtils.isEmpty(config.key_id.value())) { return true; } String values[] = { config.ca_cert.value(), config.client_cert.value() }; @@ -366,11 +366,12 @@ public class WifiConfigController implements TextWatcher, config.client_cert.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ? "" : KEYSTORE_SPACE + Credentials.USER_CERTIFICATE + (String) mEapUserCertSpinner.getSelectedItem()); - config.engine.setValue(WifiConfiguration.ENGINE_ENABLE); - config.engine_id.setValue(WifiConfiguration.KEYSTORE_ENGINE_ID); - config.key_id.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ? - "" : Credentials.USER_PRIVATE_KEY + + final boolean isEmptyKeyId = (mEapUserCertSpinner.getSelectedItemPosition() == 0); + config.key_id.setValue(isEmptyKeyId ? "" : Credentials.USER_PRIVATE_KEY + (String) mEapUserCertSpinner.getSelectedItem()); + config.engine.setValue(isEmptyKeyId ? WifiConfiguration.ENGINE_DISABLE : + WifiConfiguration.ENGINE_ENABLE); + config.engine_id.setValue(isEmptyKeyId ? "" : WifiConfiguration.KEYSTORE_ENGINE_ID); config.identity.setValue((mEapIdentityView.length() == 0) ? "" : mEapIdentityView.getText().toString()); config.anonymous_identity.setValue((mEapAnonymousView.length() == 0) ? "" : |