commit 63a9f584371cf2791ebcb68c13ef695b9b5d8071
author Chalard Jean <jchalard@google.com> Wed Mar 25 02:44:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 25 02:44:04 2020 +0000
tree bc1ba8483dfe3e4bc113477d4b14153bfcb301d8
parent 232904e22b599f898ade796bea98aabb69a96d4f
parent dd9c1f56fcd7661c2d256c3a92d47cb2a41b75d6

Merge "Expose netId by adding getter API" am: dd9c1f56fc

Change-Id: Iab3bae76255fb4096aa3b2c9da8d6f12bb588d3e

Tethering/src/com/android/server/connectivity/tethering/Tethering.java

diff --git a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
index 167e044..26c0105 100644
--- a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
+++ b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
@@ -1497,7 +1497,7 @@
             } else {
                 dnsServers = mConfig.defaultIPv4DNS;
             }
-            final int netId = (network != null) ? network.netId : NETID_UNSET;
+            final int netId = (network != null) ? network.getNetId() : NETID_UNSET;
             try {
                 mNetd.tetherDnsSet(netId, dnsServers);
                 mLog.log(String.format(