From 9c590594b60f1b251e62147694436b6ea46a3a70 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Wed, 17 Jan 2018 01:03:56 -0800
Subject: [PATCH] IpSec - API Tweak for removeTransportModeTransforms

Update IpSec tests to remove the transform parameter from
calls to removeTransportModeTransform(). It is infeasible
and thus removed.

Bug: 72079356
Test: cts - IpSecManagerTest
Change-Id: Iaa0b35b24bf044503da9af9966508ac5e88846e1
---
 .../src/android/net/cts/IpSecManagerTest.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/cts/net/src/android/net/cts/IpSecManagerTest.java b/tests/cts/net/src/android/net/cts/IpSecManagerTest.java
index 96641e3236..0ef379292c 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 @@ public class IpSecManagerTest extends AndroidTestCase {
             assertArrayEquals("Encapsulated data did not match.", TEST_DATA, in);
         }
 
-        mISM.removeTransportModeTransforms(udpSocket, transform);
+        mISM.removeTransportModeTransforms(udpSocket);
         Os.close(udpSocket);
     }
 
@@ -273,9 +273,9 @@ public class IpSecManagerTest extends AndroidTestCase {
             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 @@ public class IpSecManagerTest extends AndroidTestCase {
                 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 @@ public class IpSecManagerTest extends AndroidTestCase {
                 } 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 @@ public class IpSecManagerTest extends AndroidTestCase {
                         "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 @@ public class IpSecManagerTest extends AndroidTestCase {
                         "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);