Merge "Add a function to process LinkProperties coming from an agent." am: 15fb9f8c26 (35f8843c) · Commits · e / os / android_frameworks_base

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

+14 −5

Original line number	Diff line number	Diff line
		@@ -2713,7 +2713,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
		break;
		}
		case NetworkAgent.EVENT_NETWORK_PROPERTIES_CHANGED: {
		handleUpdateLinkProperties(nai, (LinkProperties) msg.obj);
		LinkProperties newLp = (LinkProperties) msg.obj;
		processLinkPropertiesFromAgent(nai, newLp);
		handleUpdateLinkProperties(nai, newLp);
		break;
		}
		case NetworkAgent.EVENT_NETWORK_INFO_CHANGED: {
		@@ -5808,7 +5810,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}

		LinkProperties lp = new LinkProperties(linkProperties);
		lp.ensureDirectlyConnectedRoutes();

		// TODO: Instead of passing mDefaultRequest, provide an API to determine whether a Network
		// satisfies mDefaultRequest.
		final NetworkCapabilities nc = new NetworkCapabilities(networkCapabilities);
		@@ -5816,8 +5818,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
		new Network(mNetIdManager.reserveNetId()), new NetworkInfo(networkInfo), lp, nc,
		currentScore, mContext, mTrackerHandler, new NetworkAgentConfig(networkAgentConfig),
		this, mNetd, mDnsResolver, mNMS, providerId);
		// Make sure the network capabilities reflect what the agent info says.

		// Make sure the LinkProperties and NetworkCapabilities reflect what the agent info says.
		nai.getAndSetNetworkCapabilities(mixInCapabilities(nai, nc));
		processLinkPropertiesFromAgent(nai, nai.linkProperties);

		final String extraInfo = networkInfo.getExtraInfo();
		final String name = TextUtils.isEmpty(extraInfo)
		? nai.networkCapabilities.getSsid() : extraInfo;
		@@ -5855,6 +5860,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
		updateUids(nai, null, nai.networkCapabilities);
		}

		private void processLinkPropertiesFromAgent(NetworkAgentInfo nai, LinkProperties lp) {
		lp.ensureDirectlyConnectedRoutes();
		}

		private void updateLinkProperties(NetworkAgentInfo networkAgent, LinkProperties newLp,
		@NonNull LinkProperties oldLp) {
		int netId = networkAgent.network.netId;
		@@ -6382,13 +6391,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
		// Ignore updates for disconnected networks
		return;
		}
		// newLp is already a defensive copy.
		newLp.ensureDirectlyConnectedRoutes();
		if (VDBG \|\| DDBG) {
		log("Update of LinkProperties for " + nai.toShortString()
		+ "; created=" + nai.created
		+ "; everConnected=" + nai.everConnected);
		}
		// TODO: eliminate this defensive copy after confirming that updateLinkProperties does not
		// modify its oldLp parameter.
		updateLinkProperties(nai, newLp, new LinkProperties(nai.linkProperties));
		}