Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WifiConfiguration: Undeprecate WPA_PSK" into pi-dev

Browse Source 
am: dbeb6bc3f1

Change-Id: Ib9b32466ea217703592f304d5b133d547a83f822
This commit is contained in:
Roshan Pius
2018-03-15 02:39:21 +00:00
committed by android-build-merger
parent 7bd37ca153 dbeb6bc3f1
commit 1bbb9974b3
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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";
}

5
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -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" };
}