Merge "Check for bpf support at NetworkStatsService start" into pi-dev am: 6555a9fa16
am: f407e646b4
Change-Id: Ib5acef029a83ce8fa219a8b7d1edc17c71fc2df5
This commit is contained in:
@@ -183,6 +183,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
|
||||
|
||||
private final PowerManager.WakeLock mWakeLock;
|
||||
|
||||
private final boolean mUseBpfTrafficStats;
|
||||
|
||||
private IConnectivityManager mConnManager;
|
||||
|
||||
@VisibleForTesting
|
||||
@@ -346,6 +348,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());
|
||||
@@ -946,7 +949,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
|
||||
}
|
||||
|
||||
private boolean checkBpfStatsEnable() {
|
||||
return new File("/sys/fs/bpf/traffic_uid_stats_map").exists();
|
||||
return mUseBpfTrafficStats;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user