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

Splice operations before collapsing ifaces.

Browse Source 
Bug: 6241038
Change-Id: Ide9058703f7305df8fb070af149ddce0653a0abf
This commit is contained in:
Jeff Sharkey
2012-04-09 10:27:55 -07:00
parent 920d9046bc
commit 27421b1665
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/NetworkStats.java
View File

@@ -352,10 +352,9 @@ public class NetworkStats implements Parcelable {
* on matching {@link #uid} and {@link #tag} rows. Ignores {@link #iface}, * on matching {@link #uid} and {@link #tag} rows. Ignores {@link #iface},
* since operation counts are at data layer. * since operation counts are at data layer.
*/ */
@Deprecated
public void spliceOperationsFrom(NetworkStats stats) { public void spliceOperationsFrom(NetworkStats stats) {
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
final int j = stats.findIndex(IFACE_ALL, uid[i], set[i], tag[i]); final int j = stats.findIndex(iface[i], uid[i], set[i], tag[i]);
if (j == -1) { if (j == -1) {
operations[i] = 0; operations[i] = 0;
} else { } else {

5
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -500,6 +500,9 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }
// splice in operation counts
networkLayer.spliceOperationsFrom(mUidOperations);
final NetworkStats dataLayer = new NetworkStats( final NetworkStats dataLayer = new NetworkStats(
networkLayer.getElapsedRealtime(), networkLayer.size()); networkLayer.getElapsedRealtime(), networkLayer.size());
@@ -510,8 +513,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
dataLayer.combineValues(entry); dataLayer.combineValues(entry);
} }
// splice in operation counts
dataLayer.spliceOperationsFrom(mUidOperations);
return dataLayer; return dataLayer;
} }