commit 46b4720a18314a1b54b62b6c6946e54f052e02cc
author Junyu Lai <junyulai@google.com> Wed Sep 01 06:19:57 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Sep 01 06:19:57 2021 +0000
tree 3893e1f7a0d54059819aab4b9cd6a06b5b79b21c
parent 2cfeeda7966cd94c896f7a844729f60211c16fa8
parent 162b047e746e31a74a1944aed9ab52f9f807fb3e

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

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

Change-Id: I5bdeb5bba3613bc4891ff2c1e108d6f1a334eaad

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 557fa89..df372b1 100644
--- a/services/core/java/com/android/server/net/NetworkStatsCollection.java
+++ b/services/core/java/com/android/server/net/NetworkStatsCollection.java
@@ -290,7 +290,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();