Merge changes I6d5dd0a8,I106b3e4f

* changes: Use public API Network#getNetId() to get netid Remove unused import IConnectivityManager
2021-03-25 10:49:35 +00:00
parent bd7052a00a a3bf03ed40
commit 6f244a30bc
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -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(),