diff --git a/api/system-current.txt b/api/system-current.txt index 31b5b0ed65f6a..4aa459325cd76 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -4540,8 +4540,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 b95cb1d8eaa3c..6195fde454585 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1507,6 +1507,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 2bac7a97b717a..3d641f5a0029c 100644 --- a/core/java/android/net/Network.java +++ b/core/java/android/net/Network.java @@ -65,7 +65,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 @@ -170,6 +170,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 167e044642596..26c0105dc5dec 100644 --- a/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/Tethering.java @@ -1497,7 +1497,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(