Merge "Readjust location of NETID_UNSET definition." (b36cd2dc) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -534,6 +534,13 @@ public class ConnectivityManager {
		*/
		public final static int REQUEST_ID_UNSET = 0;

		/**
		* A NetID indicating no Network is selected.
		* Keep in sync with bionic/libc/dns/include/resolv_netid.h
		* @hide
		*/
		public static final int NETID_UNSET = 0;

		private final IConnectivityManager mService;

		private final String mPackageName;
		@@ -2506,13 +2513,6 @@ public class ConnectivityManager {
		return NetworkUtils.bindProcessToNetwork(network == null ? NETID_UNSET : network.netId);
		}

		/**
		* A NetID indicating no Network is selected.
		* Keep in sync with bionic/libc/dns/include/resolv_netid.h
		* @hide
		*/
		public static final int NETID_UNSET = 0;

		/**
		* Returns the {@link Network} currently bound to this process via
		* {@link #setProcessDefaultNetwork}, or {@code null} if no {@link Network} is explicitly bound.