diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2011-09-18 16:20:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-18 16:20:00 -0700 |
| commit | aaf301736e923db15918617145069658696be453 (patch) | |
| tree | 57e9f6c22f96b27f2f348d3a7ee3c6c32d128a51 /core/java/android | |
| parent | 3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799 (diff) | |
| parent | 1f0b13b9d64085dd8342ba942f39b6063b6d534d (diff) | |
| download | frameworks_base-aaf301736e923db15918617145069658696be453.zip frameworks_base-aaf301736e923db15918617145069658696be453.tar.gz frameworks_base-aaf301736e923db15918617145069658696be453.tar.bz2 | |
Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkStatsHistory.java | 9 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/core/java/android/net/NetworkStatsHistory.java b/core/java/android/net/NetworkStatsHistory.java index d8ac31f..a5cdf70 100644 --- a/core/java/android/net/NetworkStatsHistory.java +++ b/core/java/android/net/NetworkStatsHistory.java @@ -441,10 +441,10 @@ public class NetworkStatsHistory implements Parcelable { final long curStart = bucketStart[i]; final long curEnd = curStart + bucketDuration; - // bucket is older than record; we're finished - if (curEnd < start) break; - // bucket is newer than record; keep looking - if (curStart > end) continue; + // bucket is older than request; we're finished + if (curEnd <= start) break; + // bucket is newer than request; keep looking + if (curStart >= end) continue; // include full value for active buckets, otherwise only fractional final boolean activeBucket = curStart < now && curEnd > now; @@ -466,7 +466,6 @@ public class NetworkStatsHistory implements Parcelable { if (txPackets != null) entry.txPackets += txPackets[i] * overlap / bucketDuration; if (operations != null) entry.operations += operations[i] * overlap / bucketDuration; } - return entry; } diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index e5882fc..bc5994e 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -4031,8 +4031,6 @@ public final class Settings { public static final String NETSTATS_UID_MAX_HISTORY = "netstats_uid_max_history"; /** {@hide} */ public static final String NETSTATS_TAG_MAX_HISTORY = "netstats_tag_max_history"; - /** {@hide} */ - public static final String NETSTATS_FORCE_COMPLETE_POLL = "netstats_force_complete_poll"; /** Preferred NTP server. {@hide} */ public static final String NTP_SERVER = "ntp_server"; |