Merge cherrypicks of [3594560, 3594912, 3594913, 3594914, 3594915, 3594916, 3594917, 3594918, 3594919, 3594822, 3594823, 3594561, 3594495, 3594496, 3594123, 3594124, 3594125] into pi-release

Change-Id: I8b524220d30725418e1a6dca23c873f41baa2d13
This commit is contained in:
android-build-team Robot
2018-02-09 23:44:11 +00:00

View File

@@ -187,6 +187,7 @@ public class NetworkStatsCollection implements FileRotator.Reader {
*/ */
@VisibleForTesting @VisibleForTesting
public static long multiplySafe(long value, long num, long den) { public static long multiplySafe(long value, long num, long den) {
if (den == 0) den = 1;
long x = value; long x = value;
long y = num; long y = num;