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

Merge "Use TransformRecord to get SPI instead of SpiRecord" am: ba714fa495 am: ff540abc9f am: d9c923b26d

Browse Source 
Change-Id: I2ffcf5466975d9a0f5491cf0dc4861afe28f9064
This commit is contained in:
Benedict Wong
2020-04-24 23:49:59 +00:00
committed by Automerger Merge Worker
parent b4152bb8ec d9c923b26d
commit 915542d8ad
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1776,7 +1776,7 @@ public class IpSecService extends IIpSecService.Stub {
socketRecord =
userRecord.mEncapSocketRecords.getResourceOrThrow(c.getEncapSocketResourceId());
}
SpiRecord spiRecord = userRecord.mSpiRecords.getResourceOrThrow(c.getSpiResourceId());
SpiRecord spiRecord = transformInfo.getSpiRecord();
int mark =
(direction == IpSecManager.DIRECTION_OUT)
@@ -1809,7 +1809,7 @@ public class IpSecService extends IIpSecService.Stub {
// Set outbound SPI only. We want inbound to use any valid SA (old, new) on rekeys,
// but want to guarantee outbound packets are sent over the new SA.
spi = transformInfo.getSpiRecord().getSpi();
spi = spiRecord.getSpi();
}
// Always update the policy with the relevant XFRM_IF_ID