Merge "Fixed NullPointerException in IpSecService-Netd binder layer" am: 41e1a5436b

am: a096e8d177

Change-Id: I23ea94140ac3e34fc92fdc6a2c0d694396489e03
This commit is contained in:
Manoj Boopathi Raj 2017-10-27 18:06:09 +00:00 • committed by android-build-merger
commit b4f2c19f0b

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),