From e61942535bc5d182d83f0f653f43317b63f77b59 Mon Sep 17 00:00:00 2001 From: Hai Shalom Date: Mon, 8 Apr 2019 14:07:42 -0700 Subject: [PATCH] [SettingsLib] Fix WPA2 security type string WPA2 security string was incorrect, set to WPA2-PSK instead of RSN-PSK. This caused a lot of error logs, as well as inaccurate description of the connected network in the Network details dialog. Bug: 130147064 Test: adb logcat | grep SettingsLib.AccessPoint and verify no error logs Test: Verify correct security detail in Network details dialog Change-Id: Iea57985c73b26fc38061694a76fd51ab578ea692 --- .../src/com/android/settingslib/wifi/AccessPoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 8a88a4c64d0ab..db236e5dbd2d0 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -1460,7 +1460,7 @@ public class AccessPoint implements Comparable { 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) {