Merge "Check for bpf support at NetworkStatsService start"

This commit is contained in:
Treehugger Robot
2018-05-30 19:54:42 +00:00
committed by Gerrit Code Review

View File

@@ -179,6 +179,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
private final PowerManager.WakeLock mWakeLock;
private final boolean mUseBpfTrafficStats;
private IConnectivityManager mConnManager;
@VisibleForTesting
@@ -328,6 +330,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mStatsObservers = checkNotNull(statsObservers, "missing NetworkStatsObservers");
mSystemDir = checkNotNull(systemDir, "missing systemDir");
mBaseDir = checkNotNull(baseDir, "missing baseDir");
mUseBpfTrafficStats = new File("/sys/fs/bpf/traffic_uid_stats_map").exists();
}
@VisibleForTesting
@@ -916,7 +919,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
}
private boolean checkBpfStatsEnable() {
return new File("/sys/fs/bpf/traffic_uid_stats_map").exists();
return mUseBpfTrafficStats;
}
/**