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

Commit 36dad79e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "wifi: add WPA3 Enterprise definition" into sc-dev am: 26d34a40 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13769926

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I636c4ecc9803ab5a814618635aca4d82e1abb825
parents 0cec38eb 26d34a40

packages/SettingsLib/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -64,8 +64,12 @@ 
    <string name="wifi_security_eap" translatable="false">WPA/WPA2/WPA3-Enterprise</string>

    <!-- Do not translate.  Concise terminology for wifi with WPA 802.1x EAP security -->

    <string name="wifi_security_eap_wpa" translatable="false">WPA-Enterprise</string>

    <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->

    <string name="wifi_security_eap_wpa_wpa2" translatable="false">WPA/WPA2-Enterprise</string>

    <!-- Do not translate.  Concise terminology for wifi with WPA2/WPA3 802.1x EAP security -->

    <string name="wifi_security_eap_wpa2_wpa3" translatable="false">WPA2/WPA3-Enterprise</string>

    <!-- Do not translate.  Concise terminology for wifi with WPA3 802.1x EAP security -->

    <string name="wifi_security_eap_wpa3" translatable="false">WPA3-Enterprise</string>

    <!-- Do not translate.  Concise terminology for Passpoint network -->

    <string name="wifi_security_passpoint" translatable="false">Passpoint</string>

    <!-- Do not translate.  Terminology for wifi with WPA3 security -->

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

+2 −1
Original line number Diff line number Diff line
@@ -223,7 +223,8 @@ public class AccessPoint implements Comparable<AccessPoint> { 
    public static final int SECURITY_OWE = 4;

    public static final int SECURITY_SAE = 5;

    public static final int SECURITY_EAP_SUITE_B = 6;

    public static final int SECURITY_MAX_VAL = 7; // Has to be the last

    public static final int SECURITY_EAP_WPA3_ENTERPRISE = 7;

    public static final int SECURITY_MAX_VAL = 8; // Has to be the last



    private static final int PSK_UNKNOWN = 0;

    private static final int PSK_WPA = 1;