Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check for bpf support at NetworkStatsService start" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-21 19:19:59 +00:00
committed by Android (Google) Code Review
parent 402e2a2b6f 004998251b
commit 6555a9fa16
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -184,6 +184,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
private final PowerManager.WakeLock mWakeLock;
private final boolean mUseBpfTrafficStats;
private IConnectivityManager mConnManager;
@VisibleForTesting
@@ -347,6 +349,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();
LocalServices.addService(NetworkStatsManagerInternal.class,
new NetworkStatsManagerInternalImpl());
@@ -947,7 +950,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
}
private boolean checkBpfStatsEnable() {
return new File("/sys/fs/bpf/traffic_uid_stats_map").exists();
return mUseBpfTrafficStats;
}
/**