commit | 586c2a68e878764d1c43f2718d2c0c5fbd43bf44 | [log] [tgz] |
---|---|---|
author | Junyu Lai <junyulai@google.com> | Fri Mar 20 11:23:03 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 20 11:23:03 2020 +0000 |
tree | 293e276b8234e30170df8c1204ac3b0d29853059 | |
parent | 93a644a555c13a8b32139fb60006781140261eee [diff] | |
parent | cf99dc271749574e64de06924fd85dc12db30699 [diff] |
Merge "Expose netId by adding getter API" into rvc-dev am: cf99dc2717 Change-Id: I169aabae9037f8d16fdd9e70166794173ae3c995
diff --git a/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/Tethering/src/com/android/server/connectivity/tethering/Tethering.java index 039143d..36113ac 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(