commit 6f244a30bc3746e937f47627efe562a562e564fa
author Lucas Lin <lucaslin@google.com> Thu Mar 25 10:49:35 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 25 10:49:35 2021 +0000
tree 675beae8956bc922ed9fb8c0fe79b641ceca198d
parent bd7052a00a557cf41c9c1ac2de38e47f8cced0f3
parent a3bf03ed4007dc4890360a3f2662cd00fef86d5f

Merge changes I6d5dd0a8,I106b3e4f

* changes:
  Use public API Network#getNetId() to get netid
  Remove unused import IConnectivityManager

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