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 am: 992128136d

Browse Source 
Change-Id: Ibe3182636251cb16c42e93bf886de01908de8fb9
This commit is contained in:
Chiachang Wang
2020-04-29 10:12:42 +00:00
committed by Automerger Merge Worker
parent 83ffb61136 992128136d
commit 35004c08de
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,11 +385,10 @@ 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.
delta.filterDebugEntries();
} }
// Filter out debug entries as that may lead to over counting.
delta.filterDebugEntries();
// Update mTunAnd464xlatAdjustedStats with migrated delta. // Update mTunAnd464xlatAdjustedStats with migrated delta.
mTunAnd464xlatAdjustedStats.combineAllValues(delta); mTunAnd464xlatAdjustedStats.combineAllValues(delta);
mTunAnd464xlatAdjustedStats.setElapsedRealtime(uidDetailStats.getElapsedRealtime()); mTunAnd464xlatAdjustedStats.setElapsedRealtime(uidDetailStats.getElapsedRealtime());