[SAE] Remove support for SAE Password identifier from API surface am: e7095d92bf am: 2d864ccd64 (da7a3b8c) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7240,7 +7240,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;
	}		}

wifi/java/android/net/wifi/WifiConfiguration.java

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -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();
	}		}