Merge "Fixed NullPointerException in IpSecService-Netd binder layer"
am: bf74a93eb2
Change-Id: Ia73c6bda7cb265f91648139e15f4bd2668e6c531
diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java
index a139ac4..1154fbe 100644
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -944,13 +944,13 @@
(c.getNetwork() != null) ? c.getNetwork().getNetworkHandle() : 0,
spi,
(auth != null) ? auth.getName() : "",
- (auth != null) ? auth.getKey() : null,
+ (auth != null) ? auth.getKey() : new byte[] {},
(auth != null) ? auth.getTruncationLengthBits() : 0,
(crypt != null) ? crypt.getName() : "",
- (crypt != null) ? crypt.getKey() : null,
+ (crypt != null) ? crypt.getKey() : new byte[] {},
(crypt != null) ? crypt.getTruncationLengthBits() : 0,
(authCrypt != null) ? authCrypt.getName() : "",
- (authCrypt != null) ? authCrypt.getKey() : null,
+ (authCrypt != null) ? authCrypt.getKey() : new byte[] {},
(authCrypt != null) ? authCrypt.getTruncationLengthBits() : 0,
encapType,
encapLocalPort,
diff --git a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
index b4b8094..9e97d84b 100644
--- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
+++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
@@ -206,7 +206,7 @@
eq(CRYPT_KEY),
anyInt(),
eq(""),
- isNull(),
+ eq(new byte[] {}),
eq(0),
anyInt(),
anyInt(),
@@ -227,7 +227,7 @@
eq(CRYPT_KEY),
anyInt(),
eq(""),
- isNull(),
+ eq(new byte[] {}),
eq(0),
anyInt(),
anyInt(),
@@ -256,10 +256,10 @@
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 @@
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),