diff --git a/api/system-current.txt b/api/system-current.txt index ee5c35f606a50..2a50e92435774 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -6258,8 +6258,8 @@ package android.net { public class Network implements android.os.Parcelable { ctor public Network(@NonNull android.net.Network); + method public int getNetId(); method @NonNull public android.net.Network getPrivateDnsBypassingCopy(); - field public final int netId; } public abstract class NetworkAgent { diff --git a/api/test-current.txt b/api/test-current.txt index 4704c0b11d49c..24b55af721094 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1820,6 +1820,7 @@ package android.net { public class Network implements android.os.Parcelable { ctor public Network(@NonNull android.net.Network); + method public int getNetId(); method @NonNull public android.net.Network getPrivateDnsBypassingCopy(); } diff --git a/core/java/android/net/Network.java b/core/java/android/net/Network.java index 6f5471baa7abd..f807a4968d725 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -64,7 +64,7 @@ public class Network implements Parcelable { * The unique id of the network. * @hide */ - @SystemApi + @UnsupportedAppUsage public final int netId; // Objects used to perform per-network operations such as getSocketFactory @@ -169,6 +169,17 @@ public class Network implements Parcelable { return new Network(netId, true); } + /** + * Get the unique id of the network. + * + * @hide + */ + @TestApi + @SystemApi + public int getNetId() { + return netId; + } + /** * Returns a netid marked with the Private DNS bypass flag. * diff --git a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java index 039143df64fe9..36113acf97d37 100644 --- a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java @@ -1494,7 +1494,7 @@ public class Tethering { } 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(