commit e22278838e655ed80b5c8e060632835a11df45eb
author Junyu Lai <junyulai@google.com> Wed Sep 01 06:07:18 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 01 06:07:18 2021 +0000
tree dff1bfa76584c2390ec5fbae0265885f57271b45
parent 86806e9ce4d0dc202fd06a6146b79cd7f0bef39f
parent aeaa9cf5893b9ea73732f0dc7e0ba8d14a29aa7b

Merge "NetworkStats: Avoid Division By 0"

services/core/java/com/android/server/net/NetworkStatsCollection.java

diff --git a/services/core/java/com/android/server/net/NetworkStatsCollection.java b/services/core/java/com/android/server/net/NetworkStatsCollection.java
index 6aefe41..a090c1a 100644
--- a/services/core/java/com/android/server/net/NetworkStatsCollection.java
+++ b/services/core/java/com/android/server/net/NetworkStatsCollection.java
@@ -285,7 +285,8 @@
                 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 rawTxBytes = entry.txBytes == 0 ? 1 : entry.txBytes;
             final long targetBytes = augmentPlan.getDataUsageBytes();