diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-19 18:58:06 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-19 18:58:07 -0700 |
| commit | c3e3311c050f47a229e1b49f1fdf685669d79d53 (patch) | |
| tree | 71e504514c3d22398c20d3e37941fda587edf856 /core/java/android | |
| parent | c575e007e59e00db7c1f3f2b2ea57cc24dd7c2de (diff) | |
| parent | daa57e8d1866fe4579c280c41604f3660db7cd01 (diff) | |
| download | frameworks_base-c3e3311c050f47a229e1b49f1fdf685669d79d53.zip frameworks_base-c3e3311c050f47a229e1b49f1fdf685669d79d53.tar.gz frameworks_base-c3e3311c050f47a229e1b49f1fdf685669d79d53.tar.bz2 | |
Merge "Migrate network stats from removed users." into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkStats.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/net/NetworkStats.java b/core/java/android/net/NetworkStats.java index fb7a4f8..446bbf0 100644 --- a/core/java/android/net/NetworkStats.java +++ b/core/java/android/net/NetworkStats.java @@ -21,6 +21,7 @@ import android.os.Parcelable; import android.os.SystemClock; import android.util.SparseBooleanArray; +import com.android.internal.util.ArrayUtils; import com.android.internal.util.Objects; import java.io.CharArrayWriter; @@ -608,13 +609,13 @@ public class NetworkStats implements Parcelable { * Return all rows except those attributed to the requested UID; doesn't * mutate the original structure. */ - public NetworkStats withoutUid(int uid) { + public NetworkStats withoutUids(int[] uids) { final NetworkStats stats = new NetworkStats(elapsedRealtime, 10); Entry entry = new Entry(); for (int i = 0; i < size; i++) { entry = getValues(i, entry); - if (entry.uid != uid) { + if (!ArrayUtils.contains(uids, entry.uid)) { stats.addValues(entry); } } |