Remove duplicated code in NetworkStateTrackerHandler. (9b0c8fd9) · Commits · e / os / android_frameworks_base

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

+60 −66

Original line number	Diff line number	Diff line
		@@ -116,6 +116,7 @@ import com.android.internal.net.VpnInfo;
		import com.android.internal.net.VpnProfile;
		import com.android.internal.util.AsyncChannel;
		import com.android.internal.util.IndentingPrintWriter;
		import com.android.internal.util.MessageUtils;
		import com.android.internal.util.XmlUtils;
		import com.android.server.am.BatteryStatsService;
		import com.android.server.connectivity.DataConnectionStats;
		@@ -224,6 +225,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
		private static final int ENABLED = 1;
		private static final int DISABLED = 0;

		private static final SparseArray<String> sMagicDecoderRing = MessageUtils.findMessageNames(
		new Class[] { AsyncChannel.class, ConnectivityService.class, NetworkAgent.class });

		private enum ReapUnvalidatedNetworks {
		// Tear down networks that have no chance (e.g. even if validated) of becoming
		// the highest scoring network satisfying a NetworkRequest. This should be passed when
		@@ -1891,11 +1895,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}
		}

		private boolean isLiveNetworkAgent(NetworkAgentInfo nai, String msg) {
		private boolean isLiveNetworkAgent(NetworkAgentInfo nai, int what) {
		if (nai.network == null) return false;
		final NetworkAgentInfo officialNai = getNetworkAgentInfoForNetwork(nai.network);
		if (officialNai != null && officialNai.equals(nai)) return true;
		if (officialNai != null \|\| VDBG) {
		final String msg = sMagicDecoderRing.get(what, Integer.toString(what));
		loge(msg + " - isLiveNetworkAgent found mismatched netId: " + officialNai +
		" - " + nai);
		}
		@@ -1912,10 +1917,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
		super(looper);
		}

		@Override
		public void handleMessage(Message msg) {
		NetworkInfo info;
		private boolean maybeHandleAsyncChannelMessage(Message msg) {
		switch (msg.what) {
		default:
		return false;
		case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED: {
		handleAsyncChannelHalfConnect(msg);
		break;
		@@ -1929,13 +1934,23 @@ public class ConnectivityService extends IConnectivityManager.Stub
		handleAsyncChannelDisconnected(msg);
		break;
		}
		case NetworkAgent.EVENT_NETWORK_CAPABILITIES_CHANGED: {
		}
		return true;
		}

		private void maybeHandleNetworkAgentMessage(Message msg) {
		NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
		if (nai == null) {
		loge("EVENT_NETWORK_CAPABILITIES_CHANGED from unknown NetworkAgent");
		} else {
		final NetworkCapabilities networkCapabilities =
		(NetworkCapabilities)msg.obj;
		if (VDBG) {
		final String what = sMagicDecoderRing.get(msg.what, Integer.toString(msg.what));
		log(String.format("%s from unknown NetworkAgent", what));
		}
		return;
		}

		switch (msg.what) {
		case NetworkAgent.EVENT_NETWORK_CAPABILITIES_CHANGED: {
		final NetworkCapabilities networkCapabilities = (NetworkCapabilities) msg.obj;
		if (networkCapabilities.hasCapability(NET_CAPABILITY_CAPTIVE_PORTAL) \|\|
		networkCapabilities.hasCapability(NET_CAPABILITY_VALIDATED)) {
		Slog.wtf(TAG, "BUG: " + nai + " has CS-managed capability.");
		@@ -1946,14 +1961,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
		+ nai.networkCapabilities + " -> " + networkCapabilities);
		}
		updateCapabilities(nai, networkCapabilities);
		}
		break;
		}
		case NetworkAgent.EVENT_NETWORK_PROPERTIES_CHANGED: {
		NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
		if (nai == null) {
		loge("NetworkAgent not found for EVENT_NETWORK_PROPERTIES_CHANGED");
		} else {
		if (VDBG) {
		log("Update of LinkProperties for " + nai.name() +
		"; created=" + nai.created);
		@@ -1963,35 +1973,19 @@ public class ConnectivityService extends IConnectivityManager.Stub
		nai.linkProperties = (LinkProperties)msg.obj;
		}
		if (nai.created) updateLinkProperties(nai, oldLp);
		}
		break;
		}
		case NetworkAgent.EVENT_NETWORK_INFO_CHANGED: {
		NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
		if (nai == null) {
		loge("EVENT_NETWORK_INFO_CHANGED from unknown NetworkAgent");
		break;
		}
		info = (NetworkInfo) msg.obj;
		NetworkInfo info = (NetworkInfo) msg.obj;
		updateNetworkInfo(nai, info);
		break;
		}
		case NetworkAgent.EVENT_NETWORK_SCORE_CHANGED: {
		NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
		if (nai == null) {
		loge("EVENT_NETWORK_SCORE_CHANGED from unknown NetworkAgent");
		break;
		}
		Integer score = (Integer) msg.obj;
		if (score != null) updateNetworkScore(nai, score.intValue());
		break;
		}
		case NetworkAgent.EVENT_UID_RANGES_ADDED: {
		NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
		if (nai == null) {
		loge("EVENT_UID_RANGES_ADDED from unknown NetworkAgent");
		break;
		}
		try {
		mNetd.addVpnUidRanges(nai.network.netId, (UidRange[])msg.obj);
		} catch (Exception e) {
		@@ -2001,11 +1995,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		break;
		}
		case NetworkAgent.EVENT_UID_RANGES_REMOVED: {
		NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
		if (nai == null) {
		loge("EVENT_UID_RANGES_REMOVED from unknown NetworkAgent");
		break;
		}
		try {
		mNetd.removeVpnUidRanges(nai.network.netId, (UidRange[])msg.obj);
		} catch (Exception e) {
		@@ -2015,11 +2004,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		break;
		}
		case NetworkAgent.EVENT_SET_EXPLICITLY_SELECTED: {
		NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
		if (nai == null) {
		loge("EVENT_SET_EXPLICITLY_SELECTED from unknown NetworkAgent");
		break;
		}
		if (nai.created && !nai.networkMisc.explicitlySelected) {
		loge("ERROR: created network explicitly selected.");
		}
		@@ -2028,17 +2012,19 @@ public class ConnectivityService extends IConnectivityManager.Stub
		break;
		}
		case NetworkAgent.EVENT_PACKET_KEEPALIVE: {
		NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);
		if (nai == null) {
		loge("EVENT_PACKET_KEEPALIVE from unknown NetworkAgent");
		break;
		}
		mKeepaliveTracker.handleEventPacketKeepalive(nai, msg);
		break;
		}
		}
		}

		private boolean maybeHandleNetworkMonitorMessage(Message msg) {
		switch (msg.what) {
		default:
		return false;
		case NetworkMonitor.EVENT_NETWORK_TESTED: {
		NetworkAgentInfo nai = (NetworkAgentInfo)msg.obj;
		if (isLiveNetworkAgent(nai, "EVENT_NETWORK_TESTED")) {
		if (isLiveNetworkAgent(nai, msg.what)) {
		final boolean valid =
		(msg.arg1 == NetworkMonitor.NETWORK_TEST_RESULT_VALID);
		if (DBG) log(nai.name() + " validation " + (valid ? " passed" : "failed"));
		@@ -2061,7 +2047,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}
		case NetworkMonitor.EVENT_NETWORK_LINGER_COMPLETE: {
		NetworkAgentInfo nai = (NetworkAgentInfo)msg.obj;
		if (isLiveNetworkAgent(nai, "EVENT_NETWORK_LINGER_COMPLETE")) {
		if (isLiveNetworkAgent(nai, msg.what)) {
		handleLingerComplete(nai);
		}
		break;
		@@ -2093,6 +2079,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
		break;
		}
		}
		return true;
		}

		@Override
		public void handleMessage(Message msg) {
		if (!maybeHandleAsyncChannelMessage(msg) && !maybeHandleNetworkMonitorMessage(msg)) {
		maybeHandleNetworkAgentMessage(msg);
		}
		}
		}