commit 4625faa2f2041b5df9da247dec6fd510bbf9d721
author Jeff Sharkey <jsharkey@google.com> Wed May 23 16:30:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 23 16:30:25 2018 +0000
tree a3c95e4fd7d4b2d47ad7fe7eecf9f24a24a1bbc4
parent ca8601efd10d22eb1694e8708a9aa80764b23856
parent 82739ed5848ca150737acc2bd16edc4066b227da

Merge "Last-ditch clamping of negative NetworkStats." into pi-dev

services/core/java/com/android/server/net/NetworkStatsService.java

diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index 3354525..addc479 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -184,6 +184,8 @@
 
     private final PowerManager.WakeLock mWakeLock;
 
+    private final boolean mUseBpfTrafficStats;
+
     private IConnectivityManager mConnManager;
 
     @VisibleForTesting
@@ -347,6 +349,7 @@
         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 @@
     }
 
     private boolean checkBpfStatsEnable() {
-        return new File("/sys/fs/bpf/traffic_uid_stats_map").exists();
+        return mUseBpfTrafficStats;
     }
 
     /**