Merge "Fixed NullPointerException in IpSecService-Netd binder layer" am: 626046b7f5 am: a096e8d177

am: 6e94f3f675

Change-Id: I8c51bfa708622dfb47ae55438f08b98f04c1d6c6
This commit is contained in:
Manoj Boopathi Raj
2017-10-27 18:21:48 +00:00
committed by android-build-merger

View File

@@ -206,7 +206,7 @@ public class IpSecServiceParameterizedTest {
eq(CRYPT_KEY),
anyInt(),
eq(""),
isNull(),
eq(new byte[] {}),
eq(0),
anyInt(),
anyInt(),
@@ -227,7 +227,7 @@ public class IpSecServiceParameterizedTest {
eq(CRYPT_KEY),
anyInt(),
eq(""),
isNull(),
eq(new byte[] {}),
eq(0),
anyInt(),
anyInt(),
@@ -256,10 +256,10 @@ public class IpSecServiceParameterizedTest {
anyLong(),
eq(TEST_SPI_OUT),
eq(""),
isNull(),
eq(new byte[] {}),
eq(0),
eq(""),
isNull(),
eq(new byte[] {}),
eq(0),
eq(IpSecAlgorithm.AUTH_CRYPT_AES_GCM),
eq(CRYPT_KEY),
@@ -277,10 +277,10 @@ public class IpSecServiceParameterizedTest {
anyLong(),
eq(TEST_SPI_IN),
eq(""),
isNull(),
eq(new byte[] {}),
eq(0),
eq(""),
isNull(),
eq(new byte[] {}),
eq(0),
eq(IpSecAlgorithm.AUTH_CRYPT_AES_GCM),
eq(CRYPT_KEY),