917327b1933c6edc8314fe728e5f14f6e29dd5f4 - platform/frameworks/base

commit	917327b1933c6edc8314fe728e5f14f6e29dd5f4	[log] [tgz]
author	Varun Anand <vaanand@google.com>	Sun Feb 17 23:43:25 2019 -0800
committer	Lorenzo Colitti <lorenzo@google.com>	Wed May 29 18:15:17 2019 +0900
tree	7e83bc057cb9e7c386896fca2130c8c91ea898f9
parent	2966db7c0a12ecb8c8fba9edc6322515fa740b72 [diff]

Take all VPN underlying networks into account when migrating traffic for
VPN uid.

(cherry picked from commit 95aa6d446f8197822fd5749aeb7c6aff5577c206)

Bug: 113122541
Bug: 120145746
Test: atest FrameworksNetTests
Test: Manually verified on device that stats from VPN UID are moved
      appropriately based on its declared underlying network set.
Test: vogar --mode app_process --benchmark NetworkStatsBenchmark.java

Change-Id: I7f368c5970b2dcb969fe0daf5ef44edb1f51d09d

core/java/android/net/NetworkStats.java[diff]
core/java/com/android/internal/net/VpnInfo.java[diff]
core/tests/benchmarks/src/android/net/NetworkStatsBenchmark.java[diff]
services/core/java/com/android/server/ConnectivityService.java[diff]
services/core/java/com/android/server/net/NetworkStatsRecorder.java[diff]
tests/net/java/android/net/NetworkStatsTest.java[diff]
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java[diff]

7 files changed