From 859629fa0bea0e5ea10ce147ab64ea8d85de336f Mon Sep 17 00:00:00 2001 From: Benedict Wong Date: Fri, 19 Jan 2018 17:36:02 -0800 Subject: [PATCH] Add tunnel-mode calls to netd in IpSecService Adds calls to relevant netd methods in IpSecService, enabling Tunnel mode functionality. Bug: 63588681 Test: Compiles, passing CTS + unit tests Change-Id: I6deb68584cddb03f21bd76370d4ef69cadc1bf16 --- .../com/android/server/IpSecServiceParameterizedTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java index 801a396ecb..66e0955b04 100644 --- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java @@ -19,7 +19,6 @@ package com.android.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -229,7 +228,7 @@ public class IpSecServiceParameterizedTest { anyInt(), anyString(), anyString(), - anyLong(), + anyInt(), eq(TEST_SPI), anyInt(), anyInt(), @@ -264,7 +263,7 @@ public class IpSecServiceParameterizedTest { anyInt(), anyString(), anyString(), - anyLong(), + anyInt(), eq(TEST_SPI), anyInt(), anyInt(),