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

Merge "API council requested tweaks to SubscriptionPlan." into pi-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2018-04-09 23:20:43 +00:00
committed by Android (Google) Code Review
parent e7e135c3ad 17a51c8a56
commit ecd081f906
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/net/NetworkStatsCollection.java
View File

@@ -47,7 +47,7 @@ import android.util.ArrayMap;
import android.util.AtomicFile; import android.util.AtomicFile;
import android.util.IntArray; import android.util.IntArray;
import android.util.MathUtils; import android.util.MathUtils;
import android.util.Pair; import android.util.Range;
import android.util.Slog; import android.util.Slog;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
@@ -266,11 +266,11 @@ public class NetworkStatsCollection implements FileRotator.Reader {
long collectEnd = end; long collectEnd = end;
if (augmentEnd != SubscriptionPlan.TIME_UNKNOWN) { if (augmentEnd != SubscriptionPlan.TIME_UNKNOWN) {
final Iterator<Pair<ZonedDateTime, ZonedDateTime>> it = augmentPlan.cycleIterator(); final Iterator<Range<ZonedDateTime>> it = augmentPlan.cycleIterator();
while (it.hasNext()) { while (it.hasNext()) {
final Pair<ZonedDateTime, ZonedDateTime> cycle = it.next(); final Range<ZonedDateTime> cycle = it.next();
final long cycleStart = cycle.first.toInstant().toEpochMilli(); final long cycleStart = cycle.getLower().toInstant().toEpochMilli();
final long cycleEnd = cycle.second.toInstant().toEpochMilli(); final long cycleEnd = cycle.getUpper().toInstant().toEpochMilli();
if (cycleStart <= augmentEnd && augmentEnd < cycleEnd) { if (cycleStart <= augmentEnd && augmentEnd < cycleEnd) {
augmentStart = cycleStart; augmentStart = cycleStart;
collectStart = Long.min(collectStart, augmentStart); collectStart = Long.min(collectStart, augmentStart);