Merge "Add Network inspection API." (d7069335) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -16290,10 +16290,12 @@ package android.net {
		public class ConnectivityManager {
		method public android.net.NetworkInfo getActiveNetworkInfo();
		method public android.net.NetworkInfo[] getAllNetworkInfo();
		method public android.net.Network[] getAllNetworks();
		method public deprecated boolean getBackgroundDataSetting();
		method public android.net.LinkProperties getLinkProperties(android.net.Network);
		method public android.net.NetworkCapabilities getNetworkCapabilities(android.net.Network);
		method public android.net.NetworkInfo getNetworkInfo(int);
		method public android.net.NetworkInfo getNetworkInfo(android.net.Network);
		method public deprecated int getNetworkPreference();
		method public static android.net.Network getProcessDefaultNetwork();
		method public boolean isActiveNetworkMetered();

core/java/android/net/ConnectivityManager.java

+40 −2

Original line number	Diff line number	Diff line
		@@ -743,7 +743,7 @@ public class ConnectivityManager {
		* network type or {@code null} if the type is not
		* supported by the device.
		*
		* <p>This method requires the call to hold the permission
		* <p>This method requires the caller to hold the permission
		* {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.
		*/
		public NetworkInfo getNetworkInfo(int networkType) {
		@@ -754,6 +754,27 @@ public class ConnectivityManager {
		}
		}

		/**
		* Returns connection status information about a particular
		* Network.
		*
		* @param network {@link Network} specifying which network
		* in which you're interested.
		* @return a {@link NetworkInfo} object for the requested
		* network or {@code null} if the {@code Network}
		* is not valid.
		*
		* <p>This method requires the caller to hold the permission
		* {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.
		*/
		public NetworkInfo getNetworkInfo(Network network) {
		try {
		return mService.getNetworkInfoForNetwork(network);
		} catch (RemoteException e) {
		return null;
		}
		}

		/**
		* Returns connection status information about all network
		* types supported by the device.
		@@ -761,7 +782,7 @@ public class ConnectivityManager {
		* @return an array of {@link NetworkInfo} objects. Check each
		* {@link NetworkInfo#getType} for which type each applies.
		*
		* <p>This method requires the call to hold the permission
		* <p>This method requires the caller to hold the permission
		* {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.
		*/
		public NetworkInfo[] getAllNetworkInfo() {
		@@ -772,6 +793,23 @@ public class ConnectivityManager {
		}
		}

		/**
		* Returns an array of all {@link Network} currently tracked by the
		* framework.
		*
		* @return an array of {@link Network} objects.
		*
		* <p>This method requires the caller to hold the permission
		* {@link android.Manifest.permission#ACCESS_NETWORK_STATE}.
		*/
		public Network[] getAllNetworks() {
		try {
		return mService.getAllNetworks();
		} catch (RemoteException e) {
		return null;
		}
		}

		/**
		* Returns details about the Provisioning or currently active default data network. When
		* connected, this network is the default route for outgoing connections.

core/java/android/net/IConnectivityManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -48,7 +48,9 @@ interface IConnectivityManager
		NetworkInfo getActiveNetworkInfo();
		NetworkInfo getActiveNetworkInfoForUid(int uid);
		NetworkInfo getNetworkInfo(int networkType);
		NetworkInfo getNetworkInfoForNetwork(in Network network);
		NetworkInfo[] getAllNetworkInfo();
		Network[] getAllNetworks();

		NetworkInfo getProvisioningOrActiveNetworkInfo();

services/core/java/com/android/server/ConnectivityService.java

+96 −22

Original line number	Diff line number	Diff line
		@@ -1071,6 +1071,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		*/
		private NetworkInfo getFilteredNetworkInfo(int networkType, int uid) {
		NetworkInfo info = getNetworkInfoForType(networkType);
		return getFilteredNetworkInfo(info, networkType, uid);
		}

		private NetworkInfo getFilteredNetworkInfo(NetworkInfo info, int networkType, int uid) {
		if (isNetworkBlocked(networkType, uid)) {
		// network is blocked; clone and override state
		info = new NetworkInfo(info);
		@@ -1175,6 +1179,24 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		return info;
		}

		@Override
		public NetworkInfo getNetworkInfoForNetwork(Network network) {
		enforceAccessPermission();
		if (network == null) return null;

		final int uid = Binder.getCallingUid();
		NetworkAgentInfo nai = null;
		synchronized (mNetworkForNetId) {
		nai = mNetworkForNetId.get(network.netId);
		}
		if (nai == null) return null;
		synchronized (nai) {
		if (nai.networkInfo == null) return null;

		return getFilteredNetworkInfo(nai.networkInfo, nai.networkInfo.getType(), uid);
		}
		}

		@Override
		public NetworkInfo[] getAllNetworkInfo() {
		enforceAccessPermission();
		@@ -1191,6 +1213,18 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		return result.toArray(new NetworkInfo[result.size()]);
		}

		@Override
		public Network[] getAllNetworks() {
		enforceAccessPermission();
		final ArrayList<Network> result = new ArrayList();
		synchronized (mNetworkForNetId) {
		for (int i = 0; i < mNetworkForNetId.size(); i++) {
		result.add(new Network(mNetworkForNetId.valueAt(i).network));
		}
		}
		return result.toArray(new Network[result.size()]);
		}

		@Override
		public boolean isNetworkSupported(int networkType) {
		enforceAccessPermission();
		@@ -1223,16 +1257,31 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		@Override
		public LinkProperties getLinkProperties(Network network) {
		enforceAccessPermission();
		NetworkAgentInfo nai = mNetworkForNetId.get(network.netId);
		if (nai != null) return new LinkProperties(nai.linkProperties);
		NetworkAgentInfo nai = null;
		synchronized (mNetworkForNetId) {
		nai = mNetworkForNetId.get(network.netId);
		}

		if (nai != null) {
		synchronized (nai) {
		return new LinkProperties(nai.linkProperties);
		}
		}
		return null;
		}

		@Override
		public NetworkCapabilities getNetworkCapabilities(Network network) {
		enforceAccessPermission();
		NetworkAgentInfo nai = mNetworkForNetId.get(network.netId);
		if (nai != null) return new NetworkCapabilities(nai.networkCapabilities);
		NetworkAgentInfo nai = null;
		synchronized (mNetworkForNetId) {
		nai = mNetworkForNetId.get(network.netId);
		}
		if (nai != null) {
		synchronized (nai) {
		return new NetworkCapabilities(nai.networkCapabilities);
		}
		}
		return null;
		}

		@@ -1777,8 +1826,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		}
		return false;
		}

		DetailedState netState = nai.networkInfo.getDetailedState();
		DetailedState netState;
		synchronized (nai) {
		netState = nai.networkInfo.getDetailedState();
		}

		if ((netState != DetailedState.CONNECTED &&
		netState != DetailedState.CAPTIVE_PORTAL_CHECK)) {
		@@ -1792,9 +1843,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		final int uid = Binder.getCallingUid();
		final long token = Binder.clearCallingIdentity();
		try {
		LinkProperties lp = nai.linkProperties;
		boolean ok = modifyRouteToAddress(lp, addr, ADD, TO_DEFAULT_TABLE, exempt,
		nai.network.netId, uid);
		LinkProperties lp = null;
		int netId = INVALID_NET_ID;
		synchronized (nai) {
		lp = nai.linkProperties;
		netId = nai.network.netId;
		}
		boolean ok = modifyRouteToAddress(lp, addr, ADD, TO_DEFAULT_TABLE, exempt, netId, uid);
		if (DBG) log("requestRouteToHostAddress ok=" + ok);
		return ok;
		} finally {
		@@ -3096,7 +3151,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		} else {
		if (VDBG) log("Update of Linkproperties for " + nai.name());
		LinkProperties oldLp = nai.linkProperties;
		synchronized (nai) {
		nai.linkProperties = (LinkProperties)msg.obj;
		}
		updateLinkProperties(nai, oldLp);
		}
		break;
		@@ -3242,7 +3299,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		loge("Error connecting NetworkAgent");
		NetworkAgentInfo nai = mNetworkAgentInfos.remove(msg.replyTo);
		if (nai != null) {
		synchronized (mNetworkForNetId) {
		mNetworkForNetId.remove(nai.network.netId);
		}
		mLegacyTypeTracker.remove(nai);
		}
		}
		@@ -3275,7 +3334,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		mNetworkAgentInfos.remove(msg.replyTo);
		updateClat(null, nai.linkProperties, nai);
		mLegacyTypeTracker.remove(nai);
		synchronized (mNetworkForNetId) {
		mNetworkForNetId.remove(nai.network.netId);
		}
		// Since we've lost the network, go through all the requests that
		// it was satisfying and see if any other factory can satisfy them.
		final ArrayList<NetworkAgentInfo> toActivate = new ArrayList<NetworkAgentInfo>();
		@@ -5565,7 +5626,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		private void handleRegisterNetworkAgent(NetworkAgentInfo na) {
		if (VDBG) log("Got NetworkAgent Messenger");
		mNetworkAgentInfos.put(na.messenger, na);
		synchronized (mNetworkForNetId) {
		mNetworkForNetId.put(na.network.netId, na);
		}
		na.asyncChannel.connect(mContext, mTrackerHandler, na.messenger);
		NetworkInfo networkInfo = na.networkInfo;
		na.networkInfo = null;
		@@ -5710,8 +5773,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		NetworkCapabilities networkCapabilities) {
		// TODO - what else here? Verify still satisfies everybody?
		// Check if satisfies somebody new? call callbacks?
		synchronized (networkAgent) {
		networkAgent.networkCapabilities = networkCapabilities;
		}
		}

		private void sendUpdatedScoreToFactories(NetworkRequest networkRequest, int score) {
		if (VDBG) log("sending new Min Network Score(" + score + "): " + networkRequest.toString());
		@@ -5924,8 +5989,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		private void updateNetworkInfo(NetworkAgentInfo networkAgent, NetworkInfo newInfo) {
		NetworkInfo.State state = newInfo.getState();
		NetworkInfo oldInfo = networkAgent.networkInfo;
		NetworkInfo oldInfo = null;
		synchronized (networkAgent) {
		oldInfo = networkAgent.networkInfo;
		networkAgent.networkInfo = newInfo;
		}

		if (oldInfo != null && oldInfo.getState() == state) {
		if (VDBG) log("ignoring duplicate network state non-change");
		@@ -6054,9 +6122,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		private LinkProperties getLinkPropertiesForTypeInternal(int networkType) {
		NetworkAgentInfo nai = mLegacyTypeTracker.getNetworkForType(networkType);
		return (nai != null) ?
		new LinkProperties(nai.linkProperties) :
		new LinkProperties();
		if (nai != null) {
		synchronized (nai) {
		return new LinkProperties(nai.linkProperties);
		}
		}
		return new LinkProperties();
		}

		private NetworkInfo getNetworkInfoForType(int networkType) {
		@@ -6075,8 +6146,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		private NetworkCapabilities getNetworkCapabilitiesForType(int networkType) {
		NetworkAgentInfo nai = mLegacyTypeTracker.getNetworkForType(networkType);
		return (nai != null) ?
		new NetworkCapabilities(nai.networkCapabilities) :
		new NetworkCapabilities();
		if (nai != null) {
		synchronized (nai) {
		return new NetworkCapabilities(nai.networkCapabilities);
		}
		}
		return new NetworkCapabilities();
		}
		}