Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2
Change-Id: I22e6b323c80aea7e240872d23d920c851492cd17
diff --git a/core/java/android/net/NetworkStats.java b/core/java/android/net/NetworkStats.java
index ea08892..34e48eb 100644
--- a/core/java/android/net/NetworkStats.java
+++ b/core/java/android/net/NetworkStats.java
@@ -16,8 +16,6 @@
package android.net;
-import static android.os.Process.CLAT_UID;
-
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -1095,12 +1093,6 @@
entry.txBytes += entry.txPackets * IPV4V6_HEADER_DELTA;
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});
}
/**