d8220c20507f0c346f517d715c7b9826b04d64e2 - platform/frameworks/base

commit	d8220c20507f0c346f517d715c7b9826b04d64e2	[log] [tgz]
author	Varun Anand <vaanand@google.com>	Mon Jun 10 22:44:57 2019 +0000
committer	Varun Anand <vaanand@google.com>	Mon Jun 10 16:00:48 2019 -0700
tree	0a728a01e0439910fb0a0dfecf805abc0d0074b3
parent	6a04d49ff2cdea06347e536acc498e3f9a5df1b0 [diff]

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

This reverts commit 95aa6d446f8197822fd5749aeb7c6aff5577c206.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I2f1839d7776a613ca571af8a542755ddc5fc8760
Merged-In: Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9

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