Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58083999 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I541f8edc99296f396dbf4c482a2687fb13424629
parents 14dbc9fa c98d5a9d

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

+2 −1
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ public class NetworkStatsCollection implements FileRotator.Reader, FileRotator.W 
                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();