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

Commit 14d3745d authored by Hai Shalom's avatar Hai Shalom Committed by android-build-merger
Browse files

Merge "[SettingsLib] Fix WPA2 security type string" into qt-dev am: 45e2c22d 

am: 128b0f14

Change-Id: I787e580d61a3a79b2dc59eb5b1c868b3d8e344f9
parents 199c8ac8 128b0f14

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) {