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

Merge "Adjust map names due to new bpfloader" am: 0317e9e374 am: 37cec67bdc

Browse Source 
am: 50252f86f3

Change-Id: Iedbb541ba2fa5916048e3f40d5cc128a83d0dc6b
This commit is contained in:
Chenbo Feng
2019-01-09 11:34:54 -08:00
committed by android-build-merger
parent dad2d5ad85 50252f86f3
commit 14c16b87a9
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/net/NetworkStatsFactory.java
View File

@@ -20,6 +20,7 @@ import static android.net.NetworkStats.SET_ALL;
import static android.net.NetworkStats.TAG_ALL; import static android.net.NetworkStats.TAG_ALL;
import static android.net.NetworkStats.TAG_NONE; import static android.net.NetworkStats.TAG_NONE;
import static android.net.NetworkStats.UID_ALL; import static android.net.NetworkStats.UID_ALL;
import static com.android.server.NetworkManagementSocketTagger.kernelToTag; import static com.android.server.NetworkManagementSocketTagger.kernelToTag;
import android.annotation.Nullable; import android.annotation.Nullable;
@@ -33,10 +34,8 @@ import com.android.internal.util.ProcFileReader;
import libcore.io.IoUtils; import libcore.io.IoUtils;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.net.ProtocolException; import java.net.ProtocolException;
import java.util.Arrays; import java.util.Arrays;
@@ -127,7 +126,7 @@ public class NetworkStatsFactory {
} }
public 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 @VisibleForTesting

2
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -368,7 +368,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(); mUseBpfTrafficStats = new File("/sys/fs/bpf/map_netd_app_uid_stats_map").exists();
} }
private void registerLocalService() { private void registerLocalService() {