commit ec83605aa1e6e49610b80393c944d1fe2ffabc44
author ludi <ludi@google.com> Sat May 20 14:17:05 2017 -0700
committer ludi <ludi@google.com> Tue May 23 17:28:31 2017 -0700
tree 53322e7c19916d5c3a39c4a85b02cc24e92fbe45
parent 98d8c08b8c55748735c2ff8ccbf7ad01a8f6e882

Remove the return value of ipSecAddSecurityAssociation

Bug:38350493

Test: runtest -x tests/netd_integration_test.cpp

Change-Id: I48f8462d94e8c4e95d6766c1ce7f24b8a596b743

server/XfrmController.cpp

diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp
index 344b268..34df936 100644
--- a/server/XfrmController.cpp
+++ b/server/XfrmController.cpp
@@ -359,7 +359,7 @@
     const std::string& remoteAddress, int64_t underlyingNetworkHandle, int32_t spi,
     const std::string& authAlgo, const std::vector<uint8_t>& authKey, int32_t authTruncBits,
     const std::string& cryptAlgo, const std::vector<uint8_t>& cryptKey, int32_t cryptTruncBits,
-    int32_t encapType, int32_t encapLocalPort, int32_t encapRemotePort, int32_t* allocatedSpi) {
+    int32_t encapType, int32_t encapLocalPort, int32_t encapRemotePort) {
     android::RWLock::AutoWLock lock(mLock);
 
     ALOGD("XfrmController::%s, line=%d", __FUNCTION__, __LINE__);
@@ -444,7 +444,6 @@
         return ret; // something went wrong creating the SA
     }
 
-    *allocatedSpi = spi;
     return 0;
 }