summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/DataUsageSummary.java
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-01-27 21:09:22 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-27 21:09:22 -0800
commit05eb9852a982f0ec3e24803425a794035bcc4aef (patch)
tree09176ab7ab479ade59de7e7989af561ef355171d /src/com/android/settings/DataUsageSummary.java
parentda0c98b47032871deb63596c97398d6982804c26 (diff)
parent43cbe3ffb4f0777d8aa833355c523f4a1ff93818 (diff)
downloadpackages_apps_settings-05eb9852a982f0ec3e24803425a794035bcc4aef.zip
packages_apps_settings-05eb9852a982f0ec3e24803425a794035bcc4aef.tar.gz
packages_apps_settings-05eb9852a982f0ec3e24803425a794035bcc4aef.tar.bz2
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
Diffstat (limited to 'src/com/android/settings/DataUsageSummary.java')
-rw-r--r--src/com/android/settings/DataUsageSummary.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class DataUsageSummary extends Fragment {
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);