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

Commit 8f1a910a authored by Roshan Pius's avatar Roshan Pius
Browse files

WifiConfiguration: Undeprecate WPA_PSK 

This is needed for client mode operations for configuring WPA_PSK
networks. There is no alternative public value for WPA_PSK.
The intention was to deprecate usage of this value for AP
mode, but since we share the same object across client & AP mode
operations, we cannot mark this field deprecated.

Bug: 72332080
Test: make update-api
Change-Id: I75f675b630080d853422f945d7cbc37c5f205fde
parent d854d917

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -28677,7 +28677,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" };

    }