Merge changes I6d5dd0a8,I106b3e4f am: 6f244a30bc am: f80bb2661d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653932

Change-Id: Ic04621eaa36aa0b2837dced4730d32f415f8dc13
This commit is contained in:
Lucas Lin
2021-03-25 12:22:16 +00:00
committed by Automerger Merge Worker

View File

@@ -1651,7 +1651,7 @@ public class IpSecService extends IIpSecService.Stub {
c.getMode(),
c.getSourceAddress(),
c.getDestinationAddress(),
(c.getNetwork() != null) ? c.getNetwork().netId : 0,
(c.getNetwork() != null) ? c.getNetwork().getNetId() : 0,
spiRecord.getSpi(),
c.getMarkValue(),
c.getMarkMask(),