PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WiFi: only send engine setting when key_id is set" into jb-dev

Browse Source
This commit is contained in:
Kenny Root
2012-05-11 15:49:31 -07:00
committed by Android (Google) Code Review
parent 411e7724c6 f543a71e7a
commit 72a84b78d0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -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) ? "" :