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

Snap for 6450912 from 6b639d3eb3fc417ba2279b2265255b9e8c1d1157 to mainline-release

Browse Source 
Change-Id: Ica89f4b346997c4a37ab5664a54383ac4c63c472
This commit is contained in:
android-build-team Robot
2020-05-01 07:00:38 +00:00
parent f12ae56815 abfadbefef
commit 6dd7ce6793
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);