LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I3525edc3,I6e18915e am: c861b10841 am: fa9d473f26 am: c16df4f73f am: 889f60b069

Browse Source 
Change-Id: I1c2352574ce92f2f030a01394ec4d35860053e73
This commit is contained in:
Chiachang Wang
2020-04-29 09:56:55 +00:00
committed by Automerger Merge Worker
parent 97314fbfa3 889f60b069
commit 992128136d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/net/NetworkStatsFactory.java
View File

@@ -385,10 +385,9 @@ public class NetworkStatsFactory {
// Migrate data usage over a VPN to the TUN network. // Migrate data usage over a VPN to the TUN network.
for (VpnInfo info : vpnArray) { for (VpnInfo info : vpnArray) {
delta.migrateTun(info.ownerUid, info.vpnIface, info.underlyingIfaces); delta.migrateTun(info.ownerUid, info.vpnIface, info.underlyingIfaces);
}
// Filter out debug entries as that may lead to over counting. // Filter out debug entries as that may lead to over counting.
delta.filterDebugEntries(); delta.filterDebugEntries();
}
// Update mTunAnd464xlatAdjustedStats with migrated delta. // Update mTunAnd464xlatAdjustedStats with migrated delta.
mTunAnd464xlatAdjustedStats.combineAllValues(delta); mTunAnd464xlatAdjustedStats.combineAllValues(delta);