Allow yet another combination of key management options

Framework sets allowedKeyManagement to WPA_EAP + WPA_PSK, if
WifiConfiguration didn't supply any value for it. It should probably
change to NONE; but that is post K thing. I am allowing that
combination for now.

Bug: 10843500
Change-Id: Id0c28f4aaf32c6a7e7dca07114a2452ce194a798

parent 6df7d4a5

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -361,7 +361,8 @@ public class WifiConfiguration implements Parcelable {
		if (allowedKeyManagement.get(KeyMgmt.WPA_EAP) == false) {
		return false;
		}
		if (allowedKeyManagement.get(KeyMgmt.IEEE8021X) == false) {
		if ((allowedKeyManagement.get(KeyMgmt.IEEE8021X) == false)
		&& (allowedKeyManagement.get(KeyMgmt.WPA_PSK) == false)) {
		return false;
		}
		}