Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev am: c119ee1ed2 (3c318c94) · Commits · e / os / android_frameworks_base

core/java/android/net/NetworkStats.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -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 @@ public final class NetworkStats implements Parcelable {
		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});
		}

		/**

+0 −2

Original line number	Diff line number	Diff line
		@@ -41,5 +41,3 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe
		41 dummy0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
		42 lo 0x0 0 0 1288 16 1288 16 0 0 532 8 756 8 0 0 532 8 756 8
		43 lo 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
		44 wlan0 0x0 1029 0 0 0 312046 5113 0 0 0 0 0 0 306544 5046 3230 38 2272 29
		45 wlan0 0x0 1029 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
		No newline at end of file

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,4 +2,3 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe
		2 v4-wlan0 0x0 10060 0 42600 213 4100 41 42600 213 0 0 0 0 4100 41 0 0 0 0
		3 v4-wlan0 0x0 10060 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
		4 wlan0 0x0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
		5 wlan0 0x0 1029 0 0 0 4920 41 0 0 0 0 0 0 4920 41 0 0 0 0