diff options
| author | Manoj Boopathi Raj <manojboopathi@google.com> | 2017-10-26 11:49:02 -0700 |
|---|---|---|
| committer | manojboopathi <manojboopathi@google.com> | 2017-10-26 13:10:22 -0700 |
| commit | fffa8113e0a7b646d2aff44de5a2cf84290e8951 (patch) | |
| tree | 7980a9e3d01a3c7aeeb67e5d9cbe3b0b3a014cef /tests/net/java/com/android/server/IpSecServiceParameterizedTest.java | |
| parent | 3ab81b9694f153c933d234e8d72db058c2d2fefc (diff) | |
Fixed NullPointerException in IpSecService-Netd binder layer
Replaced null with empty byte array in createTransportModeTransform
for null auth.getKey, crypt.getKey() and authCrypt.getKey()
Test: Ran CTS test
Bug: 68052730
Change-Id: I5110b1297b4bfbb5766e8ecfd3d64f8110b52945
Diffstat (limited to 'tests/net/java/com/android/server/IpSecServiceParameterizedTest.java')
| -rw-r--r-- | tests/net/java/com/android/server/IpSecServiceParameterizedTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java index b4b809480ffb..9e97d84ba680 100644 --- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java +++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java @@ -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), |