LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests 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 26719cddc7 8c302f08a9
commit 3794b5692e
1 changed files with 3 additions and 3 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,