commit f80bb2661dd15b9cce7b357ddbfabd2cf3a3ef56
author Lucas Lin <lucaslin@google.com> Thu Mar 25 11:46:03 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 25 11:46:03 2021 +0000
tree 675beae8956bc922ed9fb8c0fe79b641ceca198d
parent cc86d88f8f39a5f2213060504e0554d300d40900
parent 6f244a30bc3746e937f47627efe562a562e564fa

Merge changes I6d5dd0a8,I106b3e4f am: 6f244a30bc

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

Change-Id: Ife29dba8549f9b86cfe757a59fd4c8e61e55738f

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(),