From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 7 Feb 2018 19:28:24 +0000 (-0700)
Subject: Let's not divide by zero.
X-Git-Tag: android-x86-9.0-r1~222^2~37^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f46dc156cfcb31da8714f29338614c2cd4fc61e7;p=android-x86%2Fframeworks-base.git

Let's not divide by zero.

Test: sure
Bug: 73060623
Change-Id: Ic9d60bb99e43a05c4131f642563d792de665e592
---

diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index a6f049e1d8d0..a17dd122f760 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -1722,7 +1722,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
                 final long totalBytes = getTotalBytes(
                         NetworkTemplate.buildTemplateMobileAll(state.subscriberId), start, end);
                 final long remainingBytes = limitBytes - totalBytes;
-                final long remainingDays = Math.min(1, (end - currentTimeMillis())
+                final long remainingDays = Math.max(1, (end - currentTimeMillis())
                         / TimeUnit.DAYS.toMillis(1));
                 if (remainingBytes > 0) {
                     quotaBytes = (remainingBytes / remainingDays) / 10;