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

[WPA3] Restore @hide to WifiConfiguration#SuiteBCipher

Browse Source 
Following up on API council review, restore the @hide
to WifiConfiguration#SuiteBCipher and removed the link
to it from WifiConfiguration#allowedSuiteBCiphers.
SuiteBCipher is used internally.

Bug: 148515393
Test: Compiles
Change-Id: I8fe85295f807d5f9ec1b00585026dc01b7c0f29a
This commit is contained in:
Hai Shalom
2020-01-30 10:37:55 -08:00
parent 27c3df8ee1
commit 35b3843ccc
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/current.txt
View File

@@ -31129,11 +31129,6 @@ package android.net.wifi {
field @Deprecated public static final String[] strings;
}
@Deprecated public static class WifiConfiguration.SuiteBCipher {
field @Deprecated public static final int ECDHE_ECDSA = 0; // 0x0
field @Deprecated public static final int ECDHE_RSA = 1; // 0x1
}
public class WifiEnterpriseConfig implements android.os.Parcelable {
ctor public WifiEnterpriseConfig();
ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);

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

@@ -373,6 +373,7 @@ public class WifiConfiguration implements Parcelable {
* ECDHE_ECDSA
* ECDHE_RSA
* </pre>
* @hide
*/
public static class SuiteBCipher {
private SuiteBCipher() { }
@@ -715,8 +716,8 @@ public class WifiConfiguration implements Parcelable {
public BitSet allowedGroupManagementCiphers;
/**
* The set of SuiteB ciphers supported by this configuration.
* To be used for WPA3-Enterprise mode.
* See {@link SuiteBCipher} for descriptions of the values.
* To be used for WPA3-Enterprise mode. Set automatically by the framework based on the
* certificate type that is used in this configuration.
*/
@NonNull
public BitSet allowedSuiteBCiphers;