Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aaf4068 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

[SAE] Remove support for SAE Password identifier from API surface am:...

[SAE] Remove support for SAE Password identifier from API surface am: e7095d92 am: 2d864ccd am: da7a3b8c am: dcf27855

Change-Id: Ida481e6f69d86de6556e21870225626fc59c2dc6
parents 5c7bcb56 dcf27855
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -7249,7 +7249,6 @@ package android.net.wifi {
    field @Deprecated public int numScorerOverride;
    field @Deprecated public int numScorerOverrideAndSwitchedNetwork;
    field @Deprecated public boolean requirePmf;
    field @Deprecated @Nullable public String saePasswordId;
    field @Deprecated public boolean shared;
    field @Deprecated public boolean useExternalScores;
  }
+0 −13
Original line number Diff line number Diff line
@@ -634,13 +634,6 @@ public class WifiConfiguration implements Parcelable {
     */
    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
     * string enclosed in double quotation marks (e.g., {@code "abcdef"}),
@@ -2334,9 +2327,6 @@ public class WifiConfiguration implements Parcelable {
            sbuf.append('*');
        }

        sbuf.append('\n').append(" SAE Password Id: ");
        sbuf.append(this.saePasswordId);

        sbuf.append("\nEnterprise config:\n");
        sbuf.append(enterpriseConfig);

@@ -2731,7 +2721,6 @@ public class WifiConfiguration implements Parcelable {
            providerFriendlyName = source.providerFriendlyName;
            isHomeProviderNetwork = source.isHomeProviderNetwork;
            preSharedKey = source.preSharedKey;
            saePasswordId = source.saePasswordId;

            mNetworkSelectionStatus.copy(source.getNetworkSelectionStatus());
            apBand = source.apBand;
@@ -2819,7 +2808,6 @@ public class WifiConfiguration implements Parcelable {
            dest.writeLong(roamingConsortiumId);
        }
        dest.writeString(preSharedKey);
        dest.writeString(saePasswordId);
        for (String wepKey : wepKeys) {
            dest.writeString(wepKey);
        }
@@ -2895,7 +2883,6 @@ public class WifiConfiguration implements Parcelable {
                    config.roamingConsortiumIds[i] = in.readLong();
                }
                config.preSharedKey = in.readString();
                config.saePasswordId = in.readString();
                for (int i = 0; i < config.wepKeys.length; i++) {
                    config.wepKeys[i] = in.readString();
                }