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

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

Browse Source 
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
parent 7cacbb3c86 859629fa0b
commit 77189e8a86
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
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(),