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

Merge "Bootstrap stats before registering listeners." into ics-mr1

Browse Source
This commit is contained in:
Jeff Sharkey
2011-11-08 23:43:58 -08:00
committed by Android (Google) Code Review
parent e2de8f08d4 29f15bb4b3
commit 35226c4c27
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -466,7 +466,7 @@ public class NetworkStats implements Parcelable {
public NetworkStats subtract(NetworkStats value) throws NonMonotonicException {
final long deltaRealtime = this.elapsedRealtime - value.elapsedRealtime;
if (deltaRealtime < 0) {
throw new IllegalArgumentException("found non-monotonic realtime");
throw new NonMonotonicException(this, value);
}
// result will have our rows, and elapsed time between snapshots
@@ -586,7 +586,8 @@ public class NetworkStats implements Parcelable {
pw.print("NetworkStats: elapsedRealtime="); pw.println(elapsedRealtime);
for (int i = 0; i < size; i++) {
pw.print(prefix);
pw.print(" iface="); pw.print(iface[i]);
pw.print(" ["); pw.print(i); pw.print("]");
pw.print(" iface="); pw.print(iface[i]);
pw.print(" uid="); pw.print(uid[i]);
pw.print(" set="); pw.print(setToString(set[i]));
pw.print(" tag="); pw.print(tagToString(tag[i]));
@@ -649,6 +650,10 @@ public class NetworkStats implements Parcelable {
public final int leftIndex;
public final int rightIndex;
public NonMonotonicException(NetworkStats left, NetworkStats right) {
this(left, -1, right, -1);
}
public NonMonotonicException(
NetworkStats left, int leftIndex, NetworkStats right, int rightIndex) {
this.left = checkNotNull(left, "missing left");