Merge "Expose netId by adding getter API" am: b2b692e157 am: 80da442731 (c3f8abbf) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 {

+1 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}

+12 −1

Original line number	Diff line number	Diff line
		@@ -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.
		*

+1 −1

Original line number	Diff line number	Diff line
		@@ -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(