f6ebf4ae08aa5fad859d1f3805e7f309d604846b - platform/frameworks/base

commit	f6ebf4ae08aa5fad859d1f3805e7f309d604846b	[log] [tgz]
author	junyulai <junyulai@google.com>	Tue Oct 30 21:49:38 2018 +0800
committer	junyulai <junyulai@google.com>	Mon Dec 10 15:19:03 2018 +0800
tree	2a3a730733ad718168637faab19c8a79a91756aa
parent	0882543a128a7f1289d54600dd48a4f2df3a30df [diff]

Ignore ipv6 tx traffic on clat uid.

Currently, 464xlat counts its ipv6 tx traffic into root uid.
When user is making ipv4 upload over ipv6-only network, ipv4
tx traffic may sometimes be counted faster then ipv6 tx
traffic.

Thus, NetworkStatsService may detect non-monotonic values due
to 464xlat adjustment.

So the solution is that: for clatd, make ipv6 tx traffic counts
into clat uid, and then ignore it in the framework side.

Bug: 118602783
Test: 1. manually verify clatd traffic on clat uid.
      2. runtest frameworks-net

Change-Id: Ifb478b79e3e281918c70e16d1f90682c78f33db1

core/java/android/net/NetworkStats.java[diff]
core/java/android/os/Process.java[diff]
tests/net/java/android/net/NetworkStatsTest.java[diff]
tests/net/java/com/android/internal/net/NetworkStatsFactoryTest.java[diff]
tests/net/res/raw/xt_qtaguid_with_clat[diff]
tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after[diff]
tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_before[diff]
tests/net/res/raw/xt_qtaguid_with_clat_simple[diff]

8 files changed

tree: 2a3a730733ad718168637faab19c8a79a91756aa