[SAE] Revert "wifi: support SAE password identifier"

This reverts commit 5bffab5beff9ed28e2e61e3d9a172e3909d39e86.

Reason for revert: Privacy issue with WFA protocol b/150897608

Bug: 150897608
Test: Manually connect to SAE network without Password ID
Test: atest NetworkListStoreDataTest SupplicantStaNetworkHalTest WifiConfigStoreTest

Change-Id: I6dad3877e833b6c0cdad50e5292abd2bab848bdd

3 files changed, 0 insertions, 46 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java
index 8f8800f75..f39870723 100644
--- a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java
@@ -70,7 +70,6 @@ public class NetworkListStoreDataTest extends WifiBaseTest {
                     + "<string name=\"ConfigKey\">%s</string>\n"
                     + "<string name=\"SSID\">%s</string>\n"
                     + "<null name=\"PreSharedKey\" />\n"
-                    + "<null name=\"SaePasswordId\" />\n"
                     + "<null name=\"WEPKeys\" />\n"
                     + "<int name=\"WEPTxKeyIndex\" value=\"0\" />\n"
                     + "<boolean name=\"HiddenSSID\" value=\"false\" />\n"
@@ -125,7 +124,6 @@ public class NetworkListStoreDataTest extends WifiBaseTest {
                     + "<string name=\"ConfigKey\">%s</string>\n"
                     + "<string name=\"SSID\">%s</string>\n"
                     + "<null name=\"PreSharedKey\" />\n"
-                    + "<null name=\"SaePasswordId\" />\n"
                     + "<null name=\"WEPKeys\" />\n"
                     + "<int name=\"WEPTxKeyIndex\" value=\"0\" />\n"
                     + "<boolean name=\"HiddenSSID\" value=\"false\" />\n"
@@ -201,7 +199,6 @@ public class NetworkListStoreDataTest extends WifiBaseTest {
                     + "<string name=\"SSID\">%s</string>\n"
                     + "<string name=\"PreSharedKey\">&quot;WifiConfigurationTestUtilPsk&quot;"
                     + "</string>\n"
-                    + "<null name=\"SaePasswordId\" />\n"
                     + "<null name=\"WEPKeys\" />\n"
                     + "<int name=\"WEPTxKeyIndex\" value=\"0\" />\n"
                     + "<boolean name=\"HiddenSSID\" value=\"false\" />\n"
diff --git a/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java b/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java
index 616472c10..0e1c9806b 100644
--- a/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/SupplicantStaNetworkHalTest.java
@@ -182,31 +182,6 @@ public class SupplicantStaNetworkHalTest extends WifiBaseTest {
         verify(mISupplicantStaNetworkV12, never())
                 .getSaePassword(any(android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork
                         .getSaePasswordCallback.class));
-        verify(mISupplicantStaNetworkV12, never()).setSaePasswordId(any(String.class));
-        verify(mISupplicantStaNetworkV12, never())
-                .getPskPassphrase(any(ISupplicantStaNetwork.getPskPassphraseCallback.class));
-        verify(mISupplicantStaNetworkV12, never()).setPsk(any(byte[].class));
-        verify(mISupplicantStaNetworkV12, never())
-                .getPsk(any(ISupplicantStaNetwork.getPskCallback.class));
-    }
-
-    /**
-     * Tests the saving/loading of WifiConfiguration to wpa_supplicant with SAE password identifier.
-     */
-    @Test
-    public void testSaePasswordIdNetworkWifiConfigurationSaveLoad() throws Exception {
-        // Now expose the V1.2 ISupplicantStaNetwork
-        mSupplicantNetwork = new SupplicantStaNetworkHalSpyV1_2(mISupplicantStaNetworkMock,
-                IFACE_NAME, mContext, mWifiMonitor);
-
-        WifiConfiguration config = WifiConfigurationTestUtil.createSaeNetwork();
-        config.saePasswordId = "TestIdentifier";
-        testWifiConfigurationSaveLoad(config);
-        verify(mISupplicantStaNetworkV12).setSaePassword(any(String.class));
-        verify(mISupplicantStaNetworkV12, never())
-                .getSaePassword(any(android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork
-                        .getSaePasswordCallback.class));
-        verify(mISupplicantStaNetworkV12).setSaePasswordId(any(String.class));
         verify(mISupplicantStaNetworkV12, never())
                 .getPskPassphrase(any(ISupplicantStaNetwork.getPskPassphraseCallback.class));
         verify(mISupplicantStaNetworkV12, never()).setPsk(any(byte[].class));
@@ -1148,22 +1123,6 @@ public class SupplicantStaNetworkHalTest extends WifiBaseTest {
         }).when(mISupplicantStaNetworkV12)
                 .getSaePassword(any(android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork
                         .getSaePasswordCallback.class));
-        /** SAE password identifier*/
-        doAnswer(new AnswerWithArguments() {
-            public SupplicantStatus answer(String saePasswordId) throws RemoteException {
-                mSupplicantVariables.saePasswordId = saePasswordId;
-                return mStatusSuccess;
-            }
-        }).when(mISupplicantStaNetworkV12).setSaePasswordId(any(String.class));
-        doAnswer(new AnswerWithArguments() {
-            public void answer(android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork
-                        .getSaePasswordIdCallback cb)
-                    throws RemoteException {
-                cb.onValues(mStatusSuccess, mSupplicantVariables.saePasswordId);
-            }
-        }).when(mISupplicantStaNetworkV12)
-                .getSaePasswordId(any(android.hardware.wifi.supplicant.V1_2.ISupplicantStaNetwork
-                        .getSaePasswordIdCallback.class));
 
         /** PSK passphrase */
         doAnswer(new AnswerWithArguments() {
@@ -1778,7 +1737,6 @@ public class SupplicantStaNetworkHalTest extends WifiBaseTest {
         public String idStr;
         public int updateIdentifier;
         public String pskPassphrase;
-        public String saePasswordId;
         public byte[] psk;
         public ArrayList<Byte>[] wepKey = new ArrayList[4];
         public int wepTxKeyIdx;
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
index 8b783cbc3..ea86c4bd6 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
@@ -75,7 +75,6 @@ public class WifiConfigStoreTest extends WifiBaseTest {
                     + "<string name=\"ConfigKey\">%s</string>\n"
                     + "<string name=\"SSID\">%s</string>\n"
                     + "<null name=\"PreSharedKey\" />\n"
-                    + "<null name=\"SaePasswordId\" />\n"
                     + "<null name=\"WEPKeys\" />\n"
                     + "<int name=\"WEPTxKeyIndex\" value=\"0\" />\n"
                     + "<boolean name=\"HiddenSSID\" value=\"false\" />\n"