diff options
| author | 2018-03-15 02:11:46 +0000 | |
|---|---|---|
| committer | 2018-03-15 02:11:46 +0000 | |
| commit | dbeb6bc3f14d51cfee7b16214c348e2824a9d5ef (patch) | |
| tree | 820095243f38eb5e43cbe5bc57f5275ed7dc4bfe | |
| parent | 120f350719142485f43a64557ea570504a81d93e (diff) | |
| parent | 8f1a910ad8fa4dc2867de1c2badcdb6ad37cb9e6 (diff) | |
Merge "WifiConfiguration: Undeprecate WPA_PSK" into pi-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiConfiguration.java | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 5936ae9fd126..eab90be4adf7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; } diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index 93fa5987aa9c..6865f77fa717 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -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" }; } |