Merge "NetworkStats: Avoid Division By 0" am: e22278838e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810678

Change-Id: I5bdeb5bba3613bc4891ff2c1e108d6f1a334eaad
This commit is contained in:
Junyu Lai
2021-09-01 06:19:57 +00:00
committed by Automerger Merge Worker

View File

@@ -290,7 +290,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W
combined.getValues(augmentStart, augmentEnd, entry); combined.getValues(augmentStart, augmentEnd, entry);
} }
final long rawBytes = entry.rxBytes + entry.txBytes; final long rawBytes = (entry.rxBytes + entry.txBytes) == 0 ? 1 :
(entry.rxBytes + entry.txBytes);
final long rawRxBytes = entry.rxBytes == 0 ? 1 : entry.rxBytes; final long rawRxBytes = entry.rxBytes == 0 ? 1 : entry.rxBytes;
final long rawTxBytes = entry.txBytes == 0 ? 1 : entry.txBytes; final long rawTxBytes = entry.txBytes == 0 ? 1 : entry.txBytes;
final long targetBytes = augmentPlan.getDataUsageBytes(); final long targetBytes = augmentPlan.getDataUsageBytes();