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

Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev

Browse Source
This commit is contained in:
Lorenzo Colitti
2014-10-02 11:05:19 +00:00
committed by Android (Google) Code Review
parent 107e1fb4b8 8e1e34a3f6
commit 7fe95529e6
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -1222,18 +1222,15 @@ public class WifiConfiguration implements Parcelable {
if (allowCached && mCachedConfigKey != null) {
key = mCachedConfigKey;
} else {
key = this.SSID;
if (key == null)
key = "";
if (this.wepKeys[0] != null) {
key = key + "-WEP";
}
if (this.allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
key = key + "-" + KeyMgmt.strings[KeyMgmt.WPA_PSK];
}
if (this.allowedKeyManagement.get(KeyMgmt.WPA_EAP) ||
this.allowedKeyManagement.get(KeyMgmt.IEEE8021X)) {
key = key + "-" + KeyMgmt.strings[KeyMgmt.WPA_EAP];
if (allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
key = SSID + KeyMgmt.strings[KeyMgmt.WPA_PSK];
} else if (allowedKeyManagement.get(KeyMgmt.WPA_EAP) ||
allowedKeyManagement.get(KeyMgmt.IEEE8021X)) {
key = SSID + KeyMgmt.strings[KeyMgmt.WPA_EAP];
} else if (wepKeys[0] != null) {
key = SSID + "WEP";
} else {
key = SSID + KeyMgmt.strings[KeyMgmt.NONE];
}
mCachedConfigKey = key;
}