diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-04-09 10:27:55 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2012-04-09 10:27:55 -0700 |
| commit | 21a547823de52806de48f70b8360353344a5ad88 (patch) | |
| tree | 56214736d2974f63dbdf4d8dd62deb5526965bf9 /core/java/android/net | |
| parent | b52e3e55098c4a6e3dbfe19885895411cfb38911 (diff) | |
| download | frameworks_base-21a547823de52806de48f70b8360353344a5ad88.zip frameworks_base-21a547823de52806de48f70b8360353344a5ad88.tar.gz frameworks_base-21a547823de52806de48f70b8360353344a5ad88.tar.bz2 | |
Splice operations before collapsing ifaces.
Bug: 6241038
Change-Id: Ide9058703f7305df8fb070af149ddce0653a0abf
Diffstat (limited to 'core/java/android/net')
| -rw-r--r-- | core/java/android/net/NetworkStats.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkStats.java b/core/java/android/net/NetworkStats.java index 7a1ef66..c58725d 100644 --- a/core/java/android/net/NetworkStats.java +++ b/core/java/android/net/NetworkStats.java @@ -352,10 +352,9 @@ public class NetworkStats implements Parcelable { * on matching {@link #uid} and {@link #tag} rows. Ignores {@link #iface}, * since operation counts are at data layer. */ - @Deprecated public void spliceOperationsFrom(NetworkStats stats) { 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) { operations[i] = 0; } else { |