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

Merge "Fix incorrect interpolation of active bucket for partial requests." am: cb011605cf am: 244299e38b am: 16d7a45bfe

Browse Source 
Change-Id: I3a7df5061e0a2a90231072a5cd3e8c799302b346
This commit is contained in:
Automerger Merge Worker
2020-02-13 08:26:15 +00:00
parent d6bf586774 16d7a45bfe
commit afff4915ec
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/java/android/net/NetworkStatsHistory.java
View File

@@ -548,32 +548,32 @@ public class NetworkStatsHistory implements Parcelable {
final int startIndex = getIndexAfter(end); final int startIndex = getIndexAfter(end);
for (int i = startIndex; i >= 0; i--) { for (int i = startIndex; i >= 0; i--) {
final long curStart = bucketStart[i]; final long curStart = bucketStart[i];
final long curEnd = curStart + bucketDuration; long curEnd = curStart + bucketDuration;
// bucket is older than request; we're finished // bucket is older than request; we're finished
if (curEnd <= start) break; if (curEnd <= start) break;
// bucket is newer than request; keep looking // bucket is newer than request; keep looking
if (curStart >= end) continue; if (curStart >= end) continue;
// include full value for active buckets, otherwise only fractional // the active bucket is shorter then a normal completed bucket
final boolean activeBucket = curStart < now && curEnd > now; if (curEnd > now) curEnd = now;
final long overlap; // usually this is simply bucketDuration
if (activeBucket) { final long bucketSpan = curEnd - curStart;
overlap = bucketDuration; // prevent division by zero
} else { if (bucketSpan <= 0) continue;
final long overlapEnd = curEnd < end ? curEnd : end;
final long overlapStart = curStart > start ? curStart : start; final long overlapEnd = curEnd < end ? curEnd : end;
overlap = overlapEnd - overlapStart; final long overlapStart = curStart > start ? curStart : start;
} final long overlap = overlapEnd - overlapStart;
if (overlap <= 0) continue; if (overlap <= 0) continue;
// integer math each time is faster than floating point // integer math each time is faster than floating point
if (activeTime != null) entry.activeTime += activeTime[i] * overlap / bucketDuration; if (activeTime != null) entry.activeTime += activeTime[i] * overlap / bucketSpan;
if (rxBytes != null) entry.rxBytes += rxBytes[i] * overlap / bucketDuration; if (rxBytes != null) entry.rxBytes += rxBytes[i] * overlap / bucketSpan;
if (rxPackets != null) entry.rxPackets += rxPackets[i] * overlap / bucketDuration; if (rxPackets != null) entry.rxPackets += rxPackets[i] * overlap / bucketSpan;
if (txBytes != null) entry.txBytes += txBytes[i] * overlap / bucketDuration; if (txBytes != null) entry.txBytes += txBytes[i] * overlap / bucketSpan;
if (txPackets != null) entry.txPackets += txPackets[i] * overlap / bucketDuration; if (txPackets != null) entry.txPackets += txPackets[i] * overlap / bucketSpan;
if (operations != null) entry.operations += operations[i] * overlap / bucketDuration; if (operations != null) entry.operations += operations[i] * overlap / bucketSpan;
} }
return entry; return entry;
} }