LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Check mOwnedByTransform to avoid DELSA on SPI" am: 197361431c

Browse Source 
am: ad1edf143f

Change-Id: Ie505e32e6f3bef3fe39198396a40a2b534e2bcda
This commit is contained in:
nharold
2018-03-21 05:01:47 +00:00
committed by android-build-merger
parent e16763a960 197361431c
commit 8788f3944a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -676,10 +676,12 @@ public class IpSecService extends IIpSecService.Stub {
@Override @Override
public void freeUnderlyingResources() { public void freeUnderlyingResources() {
try { try {
if (!mOwnedByTransform) {
mSrvConfig mSrvConfig
.getNetdInstance() .getNetdInstance()
.ipSecDeleteSecurityAssociation( .ipSecDeleteSecurityAssociation(
mResourceId, mSourceAddress, mDestinationAddress, mSpi, 0, 0); mResourceId, mSourceAddress, mDestinationAddress, mSpi, 0, 0);
}
} catch (ServiceSpecificException | RemoteException e) { } catch (ServiceSpecificException | RemoteException e) {
Log.e(TAG, "Failed to delete SPI reservation with ID: " + mResourceId, e); Log.e(TAG, "Failed to delete SPI reservation with ID: " + mResourceId, e);
} }