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

am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev

Browse Source 
* commit 'df959707ff086ae1ffe516b516bfd99ac463b803':
  Revert the configKey generation algorithm to what it was in K.
This commit is contained in:
Lorenzo Colitti
2014-10-02 11:18:50 +00:00
committed by Android Git Automerger
parent 70d72265b2 df959707ff
commit eef8d3eb40
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) { if (allowCached && mCachedConfigKey != null) {
key = mCachedConfigKey; key = mCachedConfigKey;
} else { } else {
key = this.SSID; if (allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
if (key == null) key = SSID + KeyMgmt.strings[KeyMgmt.WPA_PSK];
key = ""; } else if (allowedKeyManagement.get(KeyMgmt.WPA_EAP) ||
if (this.wepKeys[0] != null) { allowedKeyManagement.get(KeyMgmt.IEEE8021X)) {
key = key + "-WEP"; key = SSID + KeyMgmt.strings[KeyMgmt.WPA_EAP];
} } else if (wepKeys[0] != null) {
if (this.allowedKeyManagement.get(KeyMgmt.WPA_PSK)) { key = SSID + "WEP";
key = key + "-" + KeyMgmt.strings[KeyMgmt.WPA_PSK]; } else {
} key = SSID + KeyMgmt.strings[KeyMgmt.NONE];
if (this.allowedKeyManagement.get(KeyMgmt.WPA_EAP) ||
this.allowedKeyManagement.get(KeyMgmt.IEEE8021X)) {
key = key + "-" + KeyMgmt.strings[KeyMgmt.WPA_EAP];
} }
mCachedConfigKey = key; mCachedConfigKey = key;
} }