LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Check for bpf support at NetworkStatsService start" into pi-dev am: 6555a9fa16

Browse Source 
am: f407e646b4

Change-Id: Ib5acef029a83ce8fa219a8b7d1edc17c71fc2df5
This commit is contained in:
Chenbo Feng
2018-05-21 12:50:12 -07:00
committed by android-build-merger
parent e60c308c0c f407e646b4
commit 5f2e77cd42
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

@@ -183,6 +183,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
@@ -346,6 +348,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();
LocalServices.addService(NetworkStatsManagerInternal.class, LocalServices.addService(NetworkStatsManagerInternal.class,
new NetworkStatsManagerInternalImpl()); new NetworkStatsManagerInternalImpl());
@@ -946,7 +949,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;
} }
/** /**