237d3e55cd - platform/packages/modules/Connectivity

commit: 237d3e55cdfbefe8df210aed32f315909325b4ab
[log]
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: e60c49033da3e76a9a6b36505ace08a640fc7d2a
parent: d73fa7584536f2413fa02f5cccd7ece2485c3cde [diff]

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

This reverts commit ee48ac4abd56e00836234be0556ef4437168bf4b.

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

Bug: 134244752
Change-Id: Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9

services/core/java/com/android/server/ConnectivityService.java[diff]
tests/net/java/android/net/NetworkStatsTest.java[diff]
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java[diff]

3 files changed

tree: e60c49033da3e76a9a6b36505ace08a640fc7d2a

core/
services/
tests/