Merge "Add tunnel-mode calls to netd in IpSecService" am: 475fe28c50
am: 77189e8a86
Change-Id: I8a3d16c8e58ad1c09d967943abe1c729fe37636a
This commit is contained in:
@@ -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(),
|
||||||
|
|||||||
Reference in New Issue
Block a user