Merge "Fixed NullPointerException in IpSecService-Netd binder layer"

This commit is contained in:
Manoj Boopathi Raj
2017-10-27 17:32:56 +00:00
committed by Gerrit Code Review

View File

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