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

Commit 53877130 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5bdeb5bba3613bc4891ff2c1e108d6f1a334eaad
parents e6544045 e2227883

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -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();