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

Merge "NetworkStats: Avoid Division By 0" into sc-qpr1-dev am: c98d5a9d97

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15782831

Change-Id: I541f8edc99296f396dbf4c482a2687fb13424629
This commit is contained in:
Aaron Huang
2021-09-10 06:07:06 +00:00
committed by Automerger Merge Worker
parent 14dbc9facc c98d5a9d97
commit 580839993a
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

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