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

Merge "[SAE] Remove support for SAE Password identifier from API surface" into rvc-dev

Browse Source
This commit is contained in:
Hai Shalom
2020-03-11 18:25:44 +00:00
committed by Android (Google) Code Review
parent c47c4c0e13 e7095d92bf
commit 43cae91e96
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -7242,7 +7242,6 @@ package android.net.wifi {
field @Deprecated public int numScorerOverride; field @Deprecated public int numScorerOverride;
field @Deprecated public int numScorerOverrideAndSwitchedNetwork; field @Deprecated public int numScorerOverrideAndSwitchedNetwork;
field @Deprecated public boolean requirePmf; field @Deprecated public boolean requirePmf;
field @Deprecated @Nullable public String saePasswordId;
field @Deprecated public boolean shared; field @Deprecated public boolean shared;
field @Deprecated public boolean useExternalScores; field @Deprecated public boolean useExternalScores;
} }

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

@@ -634,13 +634,6 @@ public class WifiConfiguration implements Parcelable {
*/ */
public String preSharedKey; public String preSharedKey;
/**
* Optional SAE Password Id for use with WPA3-SAE. It is an ASCII string.
* @hide
*/
@SystemApi
public @Nullable String saePasswordId;
/** /**
* Four WEP keys. For each of the four values, provide either an ASCII * Four WEP keys. For each of the four values, provide either an ASCII
* string enclosed in double quotation marks (e.g., {@code "abcdef"}), * string enclosed in double quotation marks (e.g., {@code "abcdef"}),
@@ -2334,9 +2327,6 @@ public class WifiConfiguration implements Parcelable {
sbuf.append('*'); sbuf.append('*');
} }
sbuf.append('\n').append(" SAE Password Id: ");
sbuf.append(this.saePasswordId);
sbuf.append("\nEnterprise config:\n"); sbuf.append("\nEnterprise config:\n");
sbuf.append(enterpriseConfig); sbuf.append(enterpriseConfig);
@@ -2731,7 +2721,6 @@ public class WifiConfiguration implements Parcelable {
providerFriendlyName = source.providerFriendlyName; providerFriendlyName = source.providerFriendlyName;
isHomeProviderNetwork = source.isHomeProviderNetwork; isHomeProviderNetwork = source.isHomeProviderNetwork;
preSharedKey = source.preSharedKey; preSharedKey = source.preSharedKey;
saePasswordId = source.saePasswordId;
mNetworkSelectionStatus.copy(source.getNetworkSelectionStatus()); mNetworkSelectionStatus.copy(source.getNetworkSelectionStatus());
apBand = source.apBand; apBand = source.apBand;
@@ -2819,7 +2808,6 @@ public class WifiConfiguration implements Parcelable {
dest.writeLong(roamingConsortiumId); dest.writeLong(roamingConsortiumId);
} }
dest.writeString(preSharedKey); dest.writeString(preSharedKey);
dest.writeString(saePasswordId);
for (String wepKey : wepKeys) { for (String wepKey : wepKeys) {
dest.writeString(wepKey); dest.writeString(wepKey);
} }
@@ -2895,7 +2883,6 @@ public class WifiConfiguration implements Parcelable {
config.roamingConsortiumIds[i] = in.readLong(); config.roamingConsortiumIds[i] = in.readLong();
} }
config.preSharedKey = in.readString(); config.preSharedKey = in.readString();
config.saePasswordId = in.readString();
for (int i = 0; i < config.wepKeys.length; i++) { for (int i = 0; i < config.wepKeys.length; i++) {
config.wepKeys[i] = in.readString(); config.wepKeys[i] = in.readString();
} }