am 43cbe3ff: am b6e57c1f: Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"

* commit '43cbe3ffb4f0777d8aa833355c523f4a1ff93818':
  Do not set minimum value for mobile data limit dialog higher than the actual set value
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index f33c11f..9db6391 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -1746,7 +1746,7 @@
             final long limitBytes = editor.getPolicyLimitBytes(template);
 
             bytesPicker.setMaxValue(Integer.MAX_VALUE);
-            if (warningBytes != WARNING_DISABLED) {
+            if (warningBytes != WARNING_DISABLED && limitBytes > 0) {
                 bytesPicker.setMinValue((int) (warningBytes / MB_IN_BYTES) + 1);
             } else {
                 bytesPicker.setMinValue(0);