edcd5ad555ac3503bb374d4b264b07a0d23592cb - platform_frameworks_base

commit	edcd5ad555ac3503bb374d4b264b07a0d23592cb	[log] [tgz]
author	Benedict Wong <benedictwong@google.com>	Wed Jun 12 17:46:15 2019 +0000
committer	Benedict Wong <benedictwong@google.com>	Fri Jun 21 01:09:49 2019 +0000
tree	dda79e47718b886487e1368439713f61f30cb054
parent	e320fca53a3fb19ef4bb096c3634754174bba8d4 [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: 113122541
Bug: 134244752
Merged-In: Ib65214598837289bd39dbf040b56ab7835f893ba
Change-Id: Ia90bf2c72ef686e80800d113d03548e0efcadb66
(cherry picked from commit a84d9fa57247cf78a9297b0c6dbd3d81b69e235f)

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