am 0ff9212d: am 19681af4: Merge "Handle throttling being disabled via policy change" into froyo

Merge commit '0ff9212d077e77f8b3e0afa232293306c0f72d07' into kraken

* commit '0ff9212d077e77f8b3e0afa232293306c0f72d07':
  Handle throttling being disabled via policy change

services/java/com/android/server/ThrottleService.java

@@ -457,6 +457,7 @@ public class ThrottleService extends IThrottleManager.Stub {
         private void checkThrottleAndPostNotification(long currentTotal) {
             // is throttling enabled?
             if (mPolicyThreshold == 0) {
+                clearThrottleAndNotification();
                 return;
             }