Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix mobile data usage didn't get increased for xlat464 traffic" into qt-dev

Browse Source
This commit is contained in:
Maciej Zenczykowski
2019-07-02 18:47:48 +00:00
committed by Android (Google) Code Review
parent bc058faaa3 71dd51cefd
commit 2c74b2e5d8
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -1217,14 +1217,22 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
} }
} }
// Traffic occurring on stacked interfaces is usually clatd, // Traffic occurring on stacked interfaces is usually clatd.
// which is already accounted against its final egress interface // UID stats are always counted on the stacked interface and never
// by the kernel. Thus, we only need to collect stacked // on the base interface, because the packets on the base interface
// interface stats at the UID level. // do not actually match application sockets until they are translated.
//
// Interface stats are more complicated. Packets subject to BPF offload
// never appear on the base interface and only appear on the stacked
// interface, so to ensure those packets increment interface stats, interface
// stats from stacked interfaces must be collected.
final List<LinkProperties> stackedLinks = state.linkProperties.getStackedLinks(); final List<LinkProperties> stackedLinks = state.linkProperties.getStackedLinks();
for (LinkProperties stackedLink : stackedLinks) { for (LinkProperties stackedLink : stackedLinks) {
final String stackedIface = stackedLink.getInterfaceName(); final String stackedIface = stackedLink.getInterfaceName();
if (stackedIface != null) { if (stackedIface != null) {
if (mUseBpfTrafficStats) {
findOrCreateNetworkIdentitySet(mActiveIfaces, stackedIface).add(ident);
}
findOrCreateNetworkIdentitySet(mActiveUidIfaces, stackedIface).add(ident); findOrCreateNetworkIdentitySet(mActiveUidIfaces, stackedIface).add(ident);
if (isMobile) { if (isMobile) {
mobileIfaces.add(stackedIface); mobileIfaces.add(stackedIface);