Merge "[SettingsLib] Fix WPA2 security type string" into qt-dev

am: 45e2c22d7e

Change-Id: I617a85d47514ac12b16a43e4ac139c4c849e45b1
This commit is contained in:
Hai Shalom
2019-04-08 19:45:26 -07:00
committed by android-build-merger

View File

@@ -1460,7 +1460,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
private static int getPskType(ScanResult result) { private static int getPskType(ScanResult result) {
boolean wpa = result.capabilities.contains("WPA-PSK"); boolean wpa = result.capabilities.contains("WPA-PSK");
boolean wpa2 = result.capabilities.contains("WPA2-PSK"); boolean wpa2 = result.capabilities.contains("RSN-PSK");
if (wpa2 && wpa) { if (wpa2 && wpa) {
return PSK_WPA_WPA2; return PSK_WPA_WPA2;
} else if (wpa2) { } else if (wpa2) {