commit 2c8aab4b61ce30c8fd28a6207f67583d53af68db
author Lucas Lin <lucaslin@google.com> Thu Mar 25 12:22:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 25 12:22:16 2021 +0000
tree 675beae8956bc922ed9fb8c0fe79b641ceca198d
parent 24f46aaa90a360f3574a26da7f99c31c170e82ba
parent 12ecb8f040c1ff1511900195c4b31da2f1cc1892

Merge changes I6d5dd0a8,I106b3e4f am: 0cf3234045 am: 12ecb8f040

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

Change-Id: Ic04621eaa36aa0b2837dced4730d32f415f8dc13

services/core/java/com/android/server/IpSecService.java

diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java
index 4c3c6ef..794cb93 100644
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -1651,7 +1651,7 @@
                         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(),