95aa6d446f8197822fd5749aeb7c6aff5577c206 - platform_frameworks_base

commit	95aa6d446f8197822fd5749aeb7c6aff5577c206	[log] [tgz]
author	Varun Anand <vaanand@google.com>	Sun Feb 17 23:43:25 2019 -0800
committer	Varun Anand <vaanand@google.com>	Thu Mar 28 10:31:49 2019 -0700
tree	bc029e734b213074908f6e25f23217cf547c2e11
parent	289759e0d2cbc381a7495e28094f55b31a702058 [diff]

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

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: I9d8d0cc58d18002c1c96f8ddff780ef8dc452d21

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

tree: bc029e734b213074908f6e25f23217cf547c2e11