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

Browse Source 
Change-Id: If9d23537009ea1359d7dc198ba4662c85f8f4b0c
This commit is contained in:
Benedict Wong
2020-04-24 23:12:27 +00:00
committed by Automerger Merge Worker
parent 5a316e581e ba714fa495
commit ff540abc9f
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 = socketRecord =
userRecord.mEncapSocketRecords.getResourceOrThrow(c.getEncapSocketResourceId()); userRecord.mEncapSocketRecords.getResourceOrThrow(c.getEncapSocketResourceId());
} }
SpiRecord spiRecord = userRecord.mSpiRecords.getResourceOrThrow(c.getSpiResourceId()); SpiRecord spiRecord = transformInfo.getSpiRecord();
int mark = int mark =
(direction == IpSecManager.DIRECTION_OUT) (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, // 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. // 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 // Always update the policy with the relevant XFRM_IF_ID