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"

Browse Source 
am: 0defa6e72c

Change-Id: Ia2b5c8c7b7185787fee57281727b366752ef887f
This commit is contained in:
Chenbo Feng
2018-05-30 15:05:08 -07:00
committed by android-build-merger
parent da6fcd1f9a 0defa6e72c
commit 8196301e24
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

@@ -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;
}
/**