diff options
| author | 2019-01-09 11:15:44 -0800 | |
|---|---|---|
| committer | 2019-01-09 11:15:44 -0800 | |
| commit | 5fb25b63898259d5002ee02693146b0be91c065f (patch) | |
| tree | 1a76578e92e615fafc8705b4e093ee54847707ec | |
| parent | dc6ada02374ba52be5c28935e9956b80efb1a17f (diff) | |
| parent | 59ce36a44d171c3dd5d058e1f2f06f4f8f805080 (diff) | |
Merge "Adjust map names due to new bpfloader" am: 9613bfd2a4
am: 59ce36a44d
Change-Id: I28a2e41a354abdd8b2113c927a6489ea8710b431
| -rw-r--r-- | core/java/com/android/internal/net/NetworkStatsFactory.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/net/NetworkStatsService.java | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/java/com/android/internal/net/NetworkStatsFactory.java b/core/java/com/android/internal/net/NetworkStatsFactory.java index 0a7cff6856e5..9bacf9b6c2b9 100644 --- a/core/java/com/android/internal/net/NetworkStatsFactory.java +++ b/core/java/com/android/internal/net/NetworkStatsFactory.java @@ -20,6 +20,7 @@ import static android.net.NetworkStats.SET_ALL; import static android.net.NetworkStats.TAG_ALL; import static android.net.NetworkStats.TAG_NONE; import static android.net.NetworkStats.UID_ALL; + import static com.android.server.NetworkManagementSocketTagger.kernelToTag; import android.annotation.Nullable; @@ -33,10 +34,8 @@ import com.android.internal.util.ProcFileReader; import libcore.io.IoUtils; -import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; import java.io.IOException; import java.net.ProtocolException; import java.util.Arrays; @@ -127,7 +126,7 @@ public class NetworkStatsFactory { } public NetworkStatsFactory() { - this(new File("/proc/"), new File("/sys/fs/bpf/traffic_uid_stats_map").exists()); + this(new File("/proc/"), new File("/sys/fs/bpf/map_netd_app_uid_stats_map").exists()); } @VisibleForTesting diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java index 82371855bdda..538326bcae0a 100644 --- a/services/core/java/com/android/server/net/NetworkStatsService.java +++ b/services/core/java/com/android/server/net/NetworkStatsService.java @@ -361,7 +361,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(); + mUseBpfTrafficStats = new File("/sys/fs/bpf/map_netd_app_uid_stats_map").exists(); } private void registerLocalService() { |