| commit | 2e4d560726541263ca688c79d3f9c7294ae5f0d4 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Fri Feb 09 10:06:59 2018 -0700 |
| committer | android-build-team Robot <android-build-team-robot@google.com> | Fri Feb 09 23:43:35 2018 +0000 |
| tree | 988652822e9d655ac3f2a6272bebceb91f44b054 | |
| parent | 644e64acb0b9c3f819d1f64137c2860ecea93aa8 [diff] |
Shore up dividing by zero protections. We're already trying to protect against zero elsewhere in this file, but we've seen evidence of it still happening, so add last-ditch protections. Test: builds, boots Bug: 73060623 Change-Id: I0549ed08f906521a8dbd9ff6162f80fa9b388434 (cherry picked from commit a7be8da9adefaf6d55f7c90b95d0c6f9e66fca63)
diff --git a/services/core/java/com/android/server/net/NetworkStatsCollection.java b/services/core/java/com/android/server/net/NetworkStatsCollection.java index 961a451..3cc4d83 100644 --- a/services/core/java/com/android/server/net/NetworkStatsCollection.java +++ b/services/core/java/com/android/server/net/NetworkStatsCollection.java
@@ -187,6 +187,7 @@ */ @VisibleForTesting public static long multiplySafe(long value, long num, long den) { + if (den == 0) den = 1; long x = value; long y = num;