Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev (a24113f0) · Commits · e / os / android_frameworks_base

core/java/android/net/IConnectivityManager.aidl

+0 −2

Original line number	Diff line number	Diff line
		@@ -120,8 +120,6 @@ interface IConnectivityManager

		LegacyVpnInfo getLegacyVpnInfo(int userId);

		VpnInfo[] getAllVpnInfo();

		boolean updateLockdownVpn();
		boolean isAlwaysOnVpnPackageSupported(int userId, String packageName);
		boolean setAlwaysOnVpnPackage(int userId, String packageName, boolean lockdown);

core/java/android/net/INetworkStatsService.aidl

+7 −1

Original line number	Diff line number	Diff line
		@@ -19,11 +19,13 @@ package android.net;
		import android.net.DataUsageRequest;
		import android.net.INetworkStatsSession;
		import android.net.Network;
		import android.net.NetworkState;
		import android.net.NetworkStats;
		import android.net.NetworkStatsHistory;
		import android.net.NetworkTemplate;
		import android.os.IBinder;
		import android.os.Messenger;
		import com.android.internal.net.VpnInfo;

		/** {@hide} */
		interface INetworkStatsService {
		@@ -58,7 +60,11 @@ interface INetworkStatsService {
		void incrementOperationCount(int uid, int tag, int operationCount);

		/** Force update of ifaces. */
		void forceUpdateIfaces(in Network[] defaultNetworks);
		void forceUpdateIfaces(
		in Network[] defaultNetworks,
		in VpnInfo[] vpnArray,
		in NetworkState[] networkStates,
		in String activeIface);
		/** Force update of statistics. */
		void forceUpdate();

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

+16 −6

Original line number	Diff line number	Diff line
		@@ -3738,12 +3738,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}

		/**
		* Return the information of all ongoing VPNs. This method is used by NetworkStatsService
		* and not available in ConnectivityManager.
		* Return the information of all ongoing VPNs.
		*
		* <p>This method is used to update NetworkStatsService.
		*
		* <p>Must be called on the handler thread.
		*/
		@Override
		public VpnInfo[] getAllVpnInfo() {
		enforceConnectivityInternalPermission();
		private VpnInfo[] getAllVpnInfo() {
		ensureRunningOnConnectivityServiceThread();
		synchronized (mVpns) {
		if (mLockdownEnabled) {
		return new VpnInfo[0];
		@@ -5775,6 +5777,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
		* Must be called on the handler thread.
		*/
		private Network[] getDefaultNetworks() {
		ensureRunningOnConnectivityServiceThread();
		ArrayList<Network> defaultNetworks = new ArrayList<>();
		NetworkAgentInfo defaultNetwork = getDefaultNetwork();
		for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
		@@ -5790,8 +5793,15 @@ public class ConnectivityService extends IConnectivityManager.Stub
		* properties tracked by NetworkStatsService on an active iface has changed.
		*/
		private void notifyIfacesChangedForNetworkStats() {
		ensureRunningOnConnectivityServiceThread();
		String activeIface = null;
		LinkProperties activeLinkProperties = getActiveLinkProperties();
		if (activeLinkProperties != null) {
		activeIface = activeLinkProperties.getInterfaceName();
		}
		try {
		mStatsService.forceUpdateIfaces(getDefaultNetworks());
		mStatsService.forceUpdateIfaces(
		getDefaultNetworks(), getAllVpnInfo(), getAllNetworkState(), activeIface);
		} catch (Exception ignored) {
		}
		}

services/core/java/com/android/server/net/NetworkStatsService.java

+22 −31

Original line number	Diff line number	Diff line
		@@ -82,7 +82,6 @@ import android.content.IntentFilter;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.net.DataUsageRequest;
		import android.net.IConnectivityManager;
		import android.net.INetworkManagementEventObserver;
		import android.net.INetworkStatsService;
		import android.net.INetworkStatsSession;
		@@ -161,9 +160,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {

		// Perform polling and persist all (FLAG_PERSIST_ALL).
		private static final int MSG_PERFORM_POLL = 1;
		private static final int MSG_UPDATE_IFACES = 2;
		// Perform polling, persist network, and register the global alert again.
		private static final int MSG_PERFORM_POLL_REGISTER_ALERT = 3;
		private static final int MSG_PERFORM_POLL_REGISTER_ALERT = 2;

		/** Flags to control detail level of poll event. */
		private static final int FLAG_PERSIST_NETWORK = 0x1;
		@@ -196,8 +194,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {

		private final boolean mUseBpfTrafficStats;

		private IConnectivityManager mConnManager;

		@VisibleForTesting
		public static final String ACTION_NETWORK_STATS_POLL =
		"com.android.server.action.NETWORK_STATS_POLL";
		@@ -259,6 +255,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		private final ArrayMap<String, NetworkIdentitySet> mActiveUidIfaces = new ArrayMap<>();

		/** Current default active iface. */
		@GuardedBy("mStatsLock")
		private String mActiveIface;

		/** Set of any ifaces associated with mobile networks since boot. */
		@@ -269,6 +266,10 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		@GuardedBy("mStatsLock")
		private Network[] mDefaultNetworks = new Network[0];

		/** Set containing info about active VPNs and their underlying networks. */
		@GuardedBy("mStatsLock")
		private VpnInfo[] mVpnInfos = new VpnInfo[0];

		private final DropBoxNonMonotonicObserver mNonMonotonicObserver =
		new DropBoxNonMonotonicObserver();

		@@ -371,10 +372,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		mHandlerCallback = callback;
		}

		public void bindConnectivityManager(IConnectivityManager connManager) {
		mConnManager = checkNotNull(connManager, "missing IConnectivityManager");
		}

		public void systemReady() {
		mSystemReady = true;

		@@ -853,13 +850,17 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		}

		@Override
		public void forceUpdateIfaces(Network[] defaultNetworks) {
		public void forceUpdateIfaces(
		Network[] defaultNetworks,
		VpnInfo[] vpnArray,
		NetworkState[] networkStates,
		String activeIface) {
		mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG);
		assertBandwidthControlEnabled();

		final long token = Binder.clearCallingIdentity();
		try {
		updateIfaces(defaultNetworks);
		updateIfaces(defaultNetworks, vpnArray, networkStates, activeIface);
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		@@ -1077,11 +1078,17 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		}
		};

		private void updateIfaces(Network[] defaultNetworks) {
		private void updateIfaces(
		Network[] defaultNetworks,
		VpnInfo[] vpnArray,
		NetworkState[] networkStates,
		String activeIface) {
		synchronized (mStatsLock) {
		mWakeLock.acquire();
		try {
		updateIfacesLocked(defaultNetworks);
		mVpnInfos = vpnArray;
		mActiveIface = activeIface;
		updateIfacesLocked(defaultNetworks, networkStates);
		} finally {
		mWakeLock.release();
		}
		@@ -1095,7 +1102,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		* {@link NetworkIdentitySet}.
		*/
		@GuardedBy("mStatsLock")
		private void updateIfacesLocked(Network[] defaultNetworks) {
		private void updateIfacesLocked(Network[] defaultNetworks, NetworkState[] states) {
		if (!mSystemReady) return;
		if (LOGV) Slog.v(TAG, "updateIfacesLocked()");

		@@ -1107,18 +1114,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		// will be persisted during next alarm poll event.
		performPollLocked(FLAG_PERSIST_NETWORK);

		final NetworkState[] states;
		final LinkProperties activeLink;
		try {
		states = mConnManager.getAllNetworkState();
		activeLink = mConnManager.getActiveLinkProperties();
		} catch (RemoteException e) {
		// ignored; service lives in system_server
		return;
		}

		mActiveIface = activeLink != null ? activeLink.getInterfaceName() : null;

		// Rebuild active interfaces based on connected networks
		mActiveIfaces.clear();
		mActiveUidIfaces.clear();
		@@ -1230,7 +1225,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		Trace.traceEnd(TRACE_TAG_NETWORK);

		// For per-UID stats, pass the VPN info so VPN traffic is reattributed to responsible apps.
		VpnInfo[] vpnArray = mConnManager.getAllVpnInfo();
		VpnInfo[] vpnArray = mVpnInfos;
		Trace.traceBegin(TRACE_TAG_NETWORK, "recordUid");
		mUidRecorder.recordSnapshotLocked(uidSnapshot, mActiveUidIfaces, vpnArray, currentTime);
		Trace.traceEnd(TRACE_TAG_NETWORK);
		@@ -1689,10 +1684,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
		mService.performPoll(FLAG_PERSIST_ALL);
		return true;
		}
		case MSG_UPDATE_IFACES: {
		mService.updateIfaces(null);
		return true;
		}
		case MSG_PERFORM_POLL_REGISTER_ALERT: {
		mService.performPoll(FLAG_PERSIST_NETWORK);
		mService.registerGlobalAlert();

services/java/com/android/server/SystemServer.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -1190,7 +1190,6 @@ public final class SystemServer {
		ServiceManager.addService(Context.CONNECTIVITY_SERVICE, connectivity,
		/* allowIsolated= */ false,
		DUMP_FLAG_PRIORITY_HIGH \| DUMP_FLAG_PRIORITY_NORMAL);
		networkStats.bindConnectivityManager(connectivity);
		networkPolicy.bindConnectivityManager(connectivity);
		} catch (Throwable e) {
		reportWtf("starting Connectivity Service", e);