Snap for 4796401 from e8a3536660bd783acec41a1785f425a1d357c69c to pi-release

Change-Id: Ic5bdeccc568be53377d663913b75d827f6573f96
This commit is contained in:
android-build-team Robot
2018-05-22 07:23:57 +00:00

View File

@@ -184,6 +184,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
@@ -347,6 +349,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());
@@ -947,7 +950,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;
} }
/** /**