a84d9fa57247cf78a9297b0c6dbd3d81b69e235f - platform_frameworks_base

commit	a84d9fa57247cf78a9297b0c6dbd3d81b69e235f	[log] [tgz]
author	Benedict Wong <benedictwong@google.com>	Wed Jun 12 17:46:15 2019 +0000
committer	Benedict Wong <benedictwong@google.com>	Thu Jun 13 15:36:27 2019 -0700
tree	94fc6095f98247355eb169f2a8a04db208e24d70
parent	781ac9ef8e367c1ba0e192cd580462a717410adc [diff]

Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""

This reverts commit d8220c20507f0c346f517d715c7b9826b04d64e2.

Reason for revert: Fix available for deadlocks.

Bug: 134244752
Change-Id: Ib65214598837289bd39dbf040b56ab7835f893ba

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