Splice operations before collapsing ifaces.

Bug: 6241038 Change-Id: Ide9058703f7305df8fb070af149ddce0653a0abf
2012-04-09 10:27:55 -07:00
parent 920d9046bc
commit 27421b1665
2 changed files with 4 additions and 4 deletions
--- a/services/java/com/android/server/net/NetworkStatsService.java
+++ b/services/java/com/android/server/net/NetworkStatsService.java
@@ -500,6 +500,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
            Binder.restoreCallingIdentity(token);
        }

+        // splice in operation counts
+        networkLayer.spliceOperationsFrom(mUidOperations);
+
        final NetworkStats dataLayer = new NetworkStats(
                networkLayer.getElapsedRealtime(), networkLayer.size());

@@ -510,8 +513,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
            dataLayer.combineValues(entry);
        }

-        // splice in operation counts
-        dataLayer.spliceOperationsFrom(mUidOperations);
        return dataLayer;
    }