Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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
parent a738702e15 a096e8d177
commit 45e455582e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/IpSecService.java
View File

@@ -944,13 +944,13 @@ public class IpSecService extends IIpSecService.Stub {
(c.getNetwork() != null) ? c.getNetwork().getNetworkHandle() : 0, (c.getNetwork() != null) ? c.getNetwork().getNetworkHandle() : 0,
spi, spi,
(auth != null) ? auth.getName() : "", (auth != null) ? auth.getName() : "",
(auth != null) ? auth.getKey() : null, (auth != null) ? auth.getKey() : new byte[] {},
(auth != null) ? auth.getTruncationLengthBits() : 0, (auth != null) ? auth.getTruncationLengthBits() : 0,
(crypt != null) ? crypt.getName() : "", (crypt != null) ? crypt.getName() : "",
(crypt != null) ? crypt.getKey() : null, (crypt != null) ? crypt.getKey() : new byte[] {},
(crypt != null) ? crypt.getTruncationLengthBits() : 0, (crypt != null) ? crypt.getTruncationLengthBits() : 0,
(authCrypt != null) ? authCrypt.getName() : "", (authCrypt != null) ? authCrypt.getName() : "",
(authCrypt != null) ? authCrypt.getKey() : null, (authCrypt != null) ? authCrypt.getKey() : new byte[] {},
(authCrypt != null) ? authCrypt.getTruncationLengthBits() : 0, (authCrypt != null) ? authCrypt.getTruncationLengthBits() : 0,
encapType, encapType,
encapLocalPort, encapLocalPort,

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