ac06c1022d8f1975b2018801f619194edcd0b78b - platform/frameworks/base

commit	ac06c1022d8f1975b2018801f619194edcd0b78b	[log] [tgz]
author	Benedict Wong <benedictwong@google.com>	Thu Jun 06 17:08:02 2019 -0700
committer	Lorenzo Colitti <lorenzo@google.com>	Fri Jun 07 09:18:01 2019 +0000
tree	87e8e8a6707e70c9cb683976044e19d584d13cb9
parent	055992b1126b243d51b60a0bc8de3cf97fe2c7cf [diff]

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

This reverts commit 917327b1933c6edc8314fe728e5f14f6e29dd5f4.

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

Bug: 134244752
Change-Id: 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