commit 6dd7ce6793033ce509d6a47d7902fe967bb02bfd
author android-build-team Robot <android-build-team-robot@google.com> Fri May 01 07:00:38 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri May 01 07:00:38 2020 +0000
tree 327d9a508806328c87530af154dcfb5b46b3194d
parent f12ae56815b6a558d9158314448f2fde35b071fa
parent abfadbefef5de05fcd7f47af341c96f49edeac9b

Snap for 6450912 from 6b639d3eb3fc417ba2279b2265255b9e8c1d1157 to mainline-release

Change-Id: Ica89f4b346997c4a37ab5664a54383ac4c63c472

services/core/java/com/android/server/net/NetworkStatsFactory.java

diff --git a/services/core/java/com/android/server/net/NetworkStatsFactory.java b/services/core/java/com/android/server/net/NetworkStatsFactory.java
index 75ffe35..3dac106 100644
--- a/services/core/java/com/android/server/net/NetworkStatsFactory.java
+++ b/services/core/java/com/android/server/net/NetworkStatsFactory.java
@@ -385,11 +385,10 @@
         // Migrate data usage over a VPN to the TUN network.
         for (VpnInfo info : vpnArray) {
             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.
         mTunAnd464xlatAdjustedStats.combineAllValues(delta);
         mTunAnd464xlatAdjustedStats.setElapsedRealtime(uidDetailStats.getElapsedRealtime());