Merge "Add tunnel-mode calls to netd in IpSecService" am: 475fe28c50 am: 77189e8a86

am: 0502191af2

Change-Id: I998d44bac0993a8f2e9e228a0b0a80adfaa4d87e
This commit is contained in:
Benedict Wong
2018-01-24 20:07:20 +00:00
committed by android-build-merger

View File

@@ -19,7 +19,6 @@ package com.android.server;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -229,7 +228,7 @@ public class IpSecServiceParameterizedTest {
anyInt(), anyInt(),
anyString(), anyString(),
anyString(), anyString(),
anyLong(), anyInt(),
eq(TEST_SPI), eq(TEST_SPI),
anyInt(), anyInt(),
anyInt(), anyInt(),
@@ -264,7 +263,7 @@ public class IpSecServiceParameterizedTest {
anyInt(), anyInt(),
anyString(), anyString(),
anyString(), anyString(),
anyLong(), anyInt(),
eq(TEST_SPI), eq(TEST_SPI),
anyInt(), anyInt(),
anyInt(), anyInt(),