Merge "Add tunnel-mode calls to netd in IpSecService" am: 475fe28c50
am: 77189e8a86
Change-Id: I8a3d16c8e58ad1c09d967943abe1c729fe37636a
This commit is contained in:
commit
0502191af2
1 changed files with 2 additions and 3 deletions
|
|
@ -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(),
|
||||
|
|
|
|||
Loading…
Reference in a new issue