OSDN Git Service

Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
authorBenedict Wong <benedictwong@google.com>
Fri, 7 Jun 2019 00:06:48 +0000 (17:06 -0700)
committerLorenzo Colitti <lorenzo@google.com>
Fri, 7 Jun 2019 09:17:47 +0000 (09:17 +0000)
commit055992b1126b243d51b60a0bc8de3cf97fe2c7cf
tree553a05a4ceab735706f4d6f4bb660e6e4cff5e9e
parent1fbf261c014edb969ad8a1107ca1feafd60e0c3b
Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."

This reverts commit ed11b84131eae1e104af9be2c17fc9b07183eee3.

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

Bug: 134244752
Change-Id: I0c00e8f0e30cee987b71b561079a97bf09d4dae4
core/java/android/net/NetworkStats.java
services/core/java/com/android/server/net/NetworkStatsFactory.java
services/core/java/com/android/server/net/NetworkStatsService.java
tests/net/java/android/net/NetworkStatsTest.java
tests/net/java/com/android/server/net/NetworkStatsServiceTest.java