From e7095d92bf4af307b63a51feccccf60eb5240e57 Mon Sep 17 00:00:00 2001
From: Hai Shalom <haishalom@google.com>
Date: Thu, 5 Mar 2020 16:44:37 -0800
Subject: [PATCH] [SAE] Remove support for SAE Password identifier from API
 surface

Remove support for SAE Password identifier from API surface due to
privacy vulnerabilities that exist in the protocol.

Bug: 150897608
Test: atest WifiConfigurationTest
Test: Manually connect to SAE network without password id
Change-Id: I40ebf7720ee51ddf264d4f256a1a75b03f1a6ca6
---
 api/system-current.txt                            |  1 -
 wifi/java/android/net/wifi/WifiConfiguration.java | 13 -------------
 2 files changed, 14 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 257bce70ae290..f591215d37d62 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -7240,7 +7240,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;
   }
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index e0b433d388eb0..ba68d170364c5 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -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();
                 }