commit da71ca08ef8f4aaaa5cbe25b49d166968e816e46
author Fan Zhang <zhfan@google.com> Mon Sep 12 17:36:22 2016 -0700
committer Fan Zhang <zhfan@google.com> Tue Sep 13 09:54:58 2016 -0700
tree 4235822f4cce9b6fccb57e696445956c70852feb
parent 3304f950bd4e7d5345e58e48c3873730a91f2e42

Parse -1 as WARNING_DISABLED in NetworkPolicyManager.

Bug: 26934313
Bug: 31437693
Test: Flashed phone with new config (-1) and verified data warning is
disabled out of box.
Change-Id: Iabdfb9d0625698d525d7537a93b936df505bd0ab

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

diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 53dbed2..3e1c529 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -1442,8 +1442,14 @@
                 + "; generating default policy");
 
         // Build default mobile policy, and assume usage cycle starts today
-        final long warningBytes = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_networkPolicyDefaultWarning) * MB_IN_BYTES;
+        final int dataWarningConfig = mContext.getResources().getInteger(
+                com.android.internal.R.integer.config_networkPolicyDefaultWarning);
+        final long warningBytes;
+        if (dataWarningConfig == WARNING_DISABLED) {
+            warningBytes = WARNING_DISABLED;
+        } else {
+            warningBytes = dataWarningConfig * MB_IN_BYTES;
+        }
 
         final Time time = new Time();
         time.setToNow();