commit dc42b714fb62d0e3d872dff930006ef459c6cf6c
author nharold <nharold@google.com> Wed Jan 17 20:36:03 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 17 20:36:03 2018 +0000
tree 2b0a82bc2c5c5d3f8197af6df76626548465dc6b
parent 1d9eb58067204892e6a566a6a03b515e736e6a19
parent 1ca0e05919a502b56ad6a3f484f62613eee6d41c

Merge "IpSec - API Tweak for removeTransportModeTransforms" am: 1ca0e05919
am: c1f0cbb244

Change-Id: I5ef872199f1b29b69799e82c0e5d13d87dc13711

tests/cts/net/src/android/net/cts/IpSecManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
index 96641e3..0ef3792 100644
--- a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
@@ -205,7 +205,7 @@
             assertArrayEquals("Encapsulated data did not match.", TEST_DATA, in);
         }
 
-        mISM.removeTransportModeTransforms(udpSocket, transform);
+        mISM.removeTransportModeTransforms(udpSocket);
         Os.close(udpSocket);
     }
 
@@ -273,9 +273,9 @@
             StatsChecker.waitForNumPackets(4 * (i + 1));
         }
 
-        mISM.removeTransportModeTransforms(server, transform);
-        mISM.removeTransportModeTransforms(client, transform);
-        mISM.removeTransportModeTransforms(accepted, transform);
+        mISM.removeTransportModeTransforms(server);
+        mISM.removeTransportModeTransforms(client);
+        mISM.removeTransportModeTransforms(accepted);
 
         Os.close(server);
         Os.close(client);
@@ -339,7 +339,7 @@
                 localSocket.receive(inPacket);
                 assertTrue("Encapsulated data did not match.",
                         Arrays.equals(outPacket.getData(), inPacket.getData()));
-                mISM.removeTransportModeTransforms(localSocket, transform);
+                mISM.removeTransportModeTransforms(localSocket);
                 localSocket.close();
             } else {
                 try {
@@ -348,7 +348,7 @@
                 } catch (IOException e) {
                     continue;
                 } finally {
-                    mISM.removeTransportModeTransforms(localSocket, transform);
+                    mISM.removeTransportModeTransforms(localSocket);
                     localSocket.close();
                 }
                 // FIXME: This check is disabled because sockets currently receive data
@@ -983,7 +983,7 @@
                         "Encap socket was unable to send/receive IKE data",
                         Arrays.equals(data, in));
 
-                mISM.removeTransportModeTransforms(udpSocket, transform);
+                mISM.removeTransportModeTransforms(udpSocket);
             } finally {
                 if (udpSocket != null) {
                     Os.close(udpSocket);
@@ -1050,7 +1050,7 @@
                         "Encap socket received UDP-encap-ESP data despite invalid SPIs",
                         Arrays.equals(header, in));
 
-                mISM.removeTransportModeTransforms(sock, transform);
+                mISM.removeTransportModeTransforms(sock);
             } finally {
                 if (sock != null) {
                     Os.close(sock);