Merge "Mark several NetworkAgentInfo members @NonNull and address TODO." (61209f85) · Commits · e / os / android_frameworks_base

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

+13 −18

Original line number	Diff line number	Diff line
		@@ -6597,7 +6597,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}

		// Don't modify caller's NetworkCapabilities.
		NetworkCapabilities newNc = new NetworkCapabilities(nc);
		final NetworkCapabilities newNc = new NetworkCapabilities(nc);
		if (nai.lastValidated) {
		newNc.addCapability(NET_CAPABILITY_VALIDATED);
		} else {
		@@ -6685,10 +6685,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
		notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_CAP_CHANGED);
		}

		// TODO : static analysis indicates that prevNc can't be null here (getAndSetNetworkCaps
		// never returns null), so mark the relevant members and functions in nai as @NonNull and
		// remove this test
		if (prevNc != null) {
		final boolean oldMetered = prevNc.isMetered();
		final boolean newMetered = newNc.isMetered();
		final boolean meteredChanged = oldMetered != newMetered;
		@@ -6698,14 +6694,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
		mRestrictBackground, mVpnBlockedUidRanges, mVpnBlockedUidRanges);
		}

		final boolean roamingChanged = prevNc.hasCapability(NET_CAPABILITY_NOT_ROAMING) !=
		newNc.hasCapability(NET_CAPABILITY_NOT_ROAMING);
		final boolean roamingChanged = prevNc.hasCapability(NET_CAPABILITY_NOT_ROAMING)
		!= newNc.hasCapability(NET_CAPABILITY_NOT_ROAMING);

		// Report changes that are interesting for network statistics tracking.
		if (meteredChanged \|\| roamingChanged) {
		notifyIfacesChangedForNetworkStats();
		}
		}

		// This network might have been underlying another network. Propagate its capabilities.
		propagateUnderlyingNetworkCapabilities(nai.network);

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -136,12 +136,12 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> {
		// This Network object should always be used if possible, so as to encourage reuse of the
		// enclosed socket factory and connection pool. Avoid creating other Network objects.
		// This Network object is always valid.
		public final Network network;
		public LinkProperties linkProperties;
		@NonNull public final Network network;
		@NonNull public LinkProperties linkProperties;
		// This should only be modified by ConnectivityService, via setNetworkCapabilities().
		// TODO: make this private with a getter.
		public NetworkCapabilities networkCapabilities;
		public final NetworkAgentConfig networkAgentConfig;
		@NonNull public NetworkCapabilities networkCapabilities;
		@NonNull public final NetworkAgentConfig networkAgentConfig;

		// Underlying networks declared by the agent. Only set if supportsUnderlyingNetworks is true.
		// The networks in this list might be declared by a VPN app using setUnderlyingNetworks and are
		@@ -603,7 +603,7 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> {
		*
		* @return the old capabilities of this network.
		*/
		public synchronized NetworkCapabilities getAndSetNetworkCapabilities(
		@NonNull public synchronized NetworkCapabilities getAndSetNetworkCapabilities(
		@NonNull final NetworkCapabilities nc) {
		final NetworkCapabilities oldNc = networkCapabilities;
		networkCapabilities = nc;