Merge "Check for bpf support at NetworkStatsService start" (0defa6e7) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -179,6 +179,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {

	private final PowerManager.WakeLock mWakeLock;		private final PowerManager.WakeLock mWakeLock;

			private final boolean mUseBpfTrafficStats;

	private IConnectivityManager mConnManager;		private IConnectivityManager mConnManager;

	@VisibleForTesting		@VisibleForTesting
	@@ -328,6 +330,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
	mStatsObservers = checkNotNull(statsObservers, "missing NetworkStatsObservers");		mStatsObservers = checkNotNull(statsObservers, "missing NetworkStatsObservers");
	mSystemDir = checkNotNull(systemDir, "missing systemDir");		mSystemDir = checkNotNull(systemDir, "missing systemDir");
	mBaseDir = checkNotNull(baseDir, "missing baseDir");		mBaseDir = checkNotNull(baseDir, "missing baseDir");
			mUseBpfTrafficStats = new File("/sys/fs/bpf/traffic_uid_stats_map").exists();
	}		}

	@VisibleForTesting		@VisibleForTesting
	@@ -916,7 +919,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
	}		}

	private boolean checkBpfStatsEnable() {		private boolean checkBpfStatsEnable() {
	return new File("/sys/fs/bpf/traffic_uid_stats_map").exists();		return mUseBpfTrafficStats;
	}		}

	/**		/**