commit 58e3896aa8a9bb4c0f8de0a86199f49c37d1db19
author markchien <markchien@google.com> Wed Mar 18 08:43:07 2020 +0800
committer Chalard Jean <jchalard@google.com> Tue Mar 24 09:19:26 2020 +0000
tree 36e463123cce61e8404283458d3bcb8c46a34070
parent a8b377747b8066594345402dd4e4750a5541acc9

Expose netId by adding getter API

Bug: 151156820
Test: m
      atest TetetheringTests

Clean CP from ag/10747732

Change-Id: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
Merged-In: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899

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 3dcc15f..8cf651b 100644
--- a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
+++ b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java
@@ -1494,7 +1494,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(