Merge "Add tunnel-mode calls to netd in IpSecService"

am: 475fe28c50

Change-Id: I60bd2cd453b8ea7b5a0fb5eb0b59e8a9fe8f57cb
This commit is contained in:
Benedict Wong
2018-01-24 19:48:26 +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.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(),