commit 84beed8a3214b71b9e29a3dbecd1af77caf6451c
author The Android Open Source Project <initial-contribution@android.com> Wed Feb 01 10:01:15 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 01 10:01:15 2012 -0800
tree e1c2349ff1bca9431a621b8eba3eaaa1e1ff437c
parent 43cbe3ffb4f0777d8aa833355c523f4a1ff93818
parent e3e777f7f208e6b88816225b5a1d33cfc59a2221

am e3e777f7: Reconcile with ics-mr1-release

* commit 'e3e777f7f208e6b88816225b5a1d33cfc59a2221':

src/com/android/settings/DataUsageSummary.java

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 46d6c65..a2f0c3f 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -1761,7 +1761,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);

src/com/android/settings/LocationSettings.java

diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
index ef438e6..fe2052c 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java
@@ -123,8 +123,9 @@
                     updateLocationToggles();
                 }
             };
-            mContentQueryMap.addObserver(mSettingsObserver);
         }
+
+        mContentQueryMap.addObserver(mSettingsObserver);
     }
 
     @Override