Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05d1af45 authored by Sravanthi Palakonda's avatar Sravanthi Palakonda Committed by Linux Build Service Account
Browse files

Wifi: Maintain configKey generation logic same in all APIs 

AutoJoinController uses configKey to distinguish networks. It compares
configKeys of saved network with recent ScanResult. WifiConfiguration
has two different APIs to generate configKey based on input variables.
Framework should use same logic to generate configkey even though input
differs. This fix ensures the parity between configKey(boolean) and
configKey(ScanResult) APIs.

Change-Id: I0b0adacafaa656cbf96f24f178f99596162b155a
parent 2fb20274

wifi/java/android/net/wifi/WifiConfiguration.java

+10 −11
Original line number Diff line number Diff line
@@ -1325,14 +1325,14 @@ public class WifiConfiguration implements Parcelable { 
            key = FQDN + KeyMgmt.strings[KeyMgmt.WPA_EAP];

        } else {

            if (allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {

                key = SSID + KeyMgmt.strings[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];

                key = SSID + "-" + KeyMgmt.strings[KeyMgmt.WPA_EAP];

            } else if (wepKeys[0] != null) {

                key = SSID + "WEP";

                key = SSID + "-WEP";

            } else {

                key = SSID + KeyMgmt.strings[KeyMgmt.NONE];

                key = SSID + "-" + KeyMgmt.strings[KeyMgmt.NONE];

            }

            mCachedConfigKey = key;

        }
@@ -1354,14 +1354,13 @@ public class WifiConfiguration implements Parcelable { 


        if (result.capabilities.contains("WEP")) {

            key = key + "-WEP";

        }



        if (result.capabilities.contains("PSK")) {

        } else if (result.capabilities.contains("PSK")) {

            key = key + "-" + KeyMgmt.strings[KeyMgmt.WPA_PSK];

        }



        if (result.capabilities.contains("EAP")) {

        } else if (result.capabilities.contains("EAP")||

                   result.capabilities.contains("IEEE8021X")) {

            key = key + "-" + KeyMgmt.strings[KeyMgmt.WPA_EAP];

        } else {

            key = key +"-" + KeyMgmt.strings[KeyMgmt.NONE];

        }



	return key;