Merge "[SettingsLib] Fix WPA2 security type string" into qt-dev (45e2c22d) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1460,7 +1460,7 @@ public class AccessPoint implements Comparable<AccessPoint> {

		private static int getPskType(ScanResult result) {
		boolean wpa = result.capabilities.contains("WPA-PSK");
		boolean wpa2 = result.capabilities.contains("WPA2-PSK");
		boolean wpa2 = result.capabilities.contains("RSN-PSK");
		if (wpa2 && wpa) {
		return PSK_WPA_WPA2;
		} else if (wpa2) {