LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "IpSec - API Tweak for removeTransportModeTransforms"

Browse Source
This commit is contained in:
nharold
2018-01-17 19:07:10 +00:00
committed by Gerrit Code Review
parent 44eef0ee8d 9c590594b6
commit 1ca0e05919
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cts/net/src/android/net/cts/IpSecManagerTest.java
View File

@@ -205,7 +205,7 @@ public class IpSecManagerTest extends AndroidTestCase {
assertArrayEquals("Encapsulated data did not match.", TEST_DATA, in); assertArrayEquals("Encapsulated data did not match.", TEST_DATA, in);
} }
mISM.removeTransportModeTransforms(udpSocket, transform); mISM.removeTransportModeTransforms(udpSocket);
Os.close(udpSocket); Os.close(udpSocket);
} }
@@ -273,9 +273,9 @@ public class IpSecManagerTest extends AndroidTestCase {
StatsChecker.waitForNumPackets(4 * (i + 1)); StatsChecker.waitForNumPackets(4 * (i + 1));
} }
mISM.removeTransportModeTransforms(server, transform); mISM.removeTransportModeTransforms(server);
mISM.removeTransportModeTransforms(client, transform); mISM.removeTransportModeTransforms(client);
mISM.removeTransportModeTransforms(accepted, transform); mISM.removeTransportModeTransforms(accepted);
Os.close(server); Os.close(server);
Os.close(client); Os.close(client);
@@ -339,7 +339,7 @@ public class IpSecManagerTest extends AndroidTestCase {
localSocket.receive(inPacket); localSocket.receive(inPacket);
assertTrue("Encapsulated data did not match.", assertTrue("Encapsulated data did not match.",
Arrays.equals(outPacket.getData(), inPacket.getData())); Arrays.equals(outPacket.getData(), inPacket.getData()));
mISM.removeTransportModeTransforms(localSocket, transform); mISM.removeTransportModeTransforms(localSocket);
localSocket.close(); localSocket.close();
} else { } else {
try { try {
@@ -348,7 +348,7 @@ public class IpSecManagerTest extends AndroidTestCase {
} catch (IOException e) { } catch (IOException e) {
continue; continue;
} finally { } finally {
mISM.removeTransportModeTransforms(localSocket, transform); mISM.removeTransportModeTransforms(localSocket);
localSocket.close(); localSocket.close();
} }
// FIXME: This check is disabled because sockets currently receive data // 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", "Encap socket was unable to send/receive IKE data",
Arrays.equals(data, in)); Arrays.equals(data, in));
mISM.removeTransportModeTransforms(udpSocket, transform); mISM.removeTransportModeTransforms(udpSocket);
} finally { } finally {
if (udpSocket != null) { if (udpSocket != null) {
Os.close(udpSocket); Os.close(udpSocket);
@@ -1050,7 +1050,7 @@ public class IpSecManagerTest extends AndroidTestCase {
"Encap socket received UDP-encap-ESP data despite invalid SPIs", "Encap socket received UDP-encap-ESP data despite invalid SPIs",
Arrays.equals(header, in)); Arrays.equals(header, in));
mISM.removeTransportModeTransforms(sock, transform); mISM.removeTransportModeTransforms(sock);
} finally { } finally {
if (sock != null) { if (sock != null) {
Os.close(sock); Os.close(sock);