joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
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
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
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),