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

Commit dbeb6bc3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "WifiConfiguration: Undeprecate WPA_PSK" into pi-dev

parents 120f3507 8f1a910a

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -28680,7 +28680,7 @@ package android.net.wifi { 
    field public static final int IEEE8021X = 3; // 0x3

    field public static final int NONE = 0; // 0x0

    field public static final int WPA_EAP = 2; // 0x2

    field public static final deprecated int WPA_PSK = 1; // 0x1

    field public static final int WPA_PSK = 1; // 0x1

    field public static final java.lang.String[] strings;

    field public static final java.lang.String varName = "key_mgmt";

  }

wifi/java/android/net/wifi/WifiConfiguration.java

+1 −4
Original line number Diff line number Diff line
@@ -86,9 +86,6 @@ public class WifiConfiguration implements Parcelable { 
        /** WPA is not used; plaintext or static WEP could be used. */

        public static final int NONE = 0;

        /** WPA pre-shared key (requires {@code preSharedKey} to be specified). */

        /** @deprecated Due to security and performance limitations, use of WPA-1 networks

         * is discouraged. WPA-2 (RSN) should be used instead. */

        @Deprecated

        public static final int WPA_PSK = 1;

        /** WPA using EAP authentication. Generally used with an external authentication server. */

        public static final int WPA_EAP = 2;
@@ -122,7 +119,7 @@ public class WifiConfiguration implements Parcelable { 


        public static final String varName = "key_mgmt";



        public static final String[] strings = { "NONE", /* deprecated */ "WPA_PSK", "WPA_EAP",

        public static final String[] strings = { "NONE", "WPA_PSK", "WPA_EAP",

                "IEEE8021X", "WPA2_PSK", "OSEN", "FT_PSK", "FT_EAP" };

    }