Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "NetworkStats: Avoid Division By 0"

Browse Source
This commit is contained in:
Junyu Lai
2021-09-01 06:07:18 +00:00
committed by Gerrit Code Review
parent 86806e9ce4 aeaa9cf589
commit e22278838e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -285,7 +285,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();