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

Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2

Browse Source 
Change-Id: Iec9a061d0f91993e65c5d110955e8f23b0f0d945
This commit is contained in:
TreeHugger Robot
2020-05-28 21:28:28 +00:00
committed by Automerger Merge Worker
parent 27799a5019 9d862381bb
commit baf5cf8020
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/net/NetworkStats.java
View File

@@ -16,8 +16,6 @@
package android.net; package android.net;
import static android.os.Process.CLAT_UID;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
@@ -1095,12 +1093,6 @@ public final class NetworkStats implements Parcelable {
entry.txBytes += entry.txPackets * IPV4V6_HEADER_DELTA; entry.txBytes += entry.txPackets * IPV4V6_HEADER_DELTA;
stackedTraffic.setValues(i, entry); stackedTraffic.setValues(i, entry);
} }
// Theoretically there should be no traffic accounted to the clat daemon's uid:
// see ebpf program 'netd.c's early returns
// and iptables '-m owner --uid-owner clat -j RETURN' rules prior to accounting
// TODO: remove this - should definitely be safe once ebpf only.
baseTraffic.removeUids(new int[] {CLAT_UID});
} }
/** /**