diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-04-26 11:13:11 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-04-26 11:13:11 -0700 |
| commit | 19681af44b7c7494ae8de28dab8aacc3e9d92390 (patch) | |
| tree | 872bd1596584616548b571227f908e255dfafe02 | |
| parent | 374aee6888edddc5bcac9a644ad3de812404d3bc (diff) | |
| parent | cce83379ef5ddd122ffe6fcce431cb86d059a74b (diff) | |
| download | frameworks_base-19681af44b7c7494ae8de28dab8aacc3e9d92390.zip frameworks_base-19681af44b7c7494ae8de28dab8aacc3e9d92390.tar.gz frameworks_base-19681af44b7c7494ae8de28dab8aacc3e9d92390.tar.bz2 | |
Merge "Handle throttling being disabled via policy change" into froyo
| -rw-r--r-- | services/java/com/android/server/ThrottleService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/ThrottleService.java b/services/java/com/android/server/ThrottleService.java index 2fe7420..a1aa555 100644 --- a/services/java/com/android/server/ThrottleService.java +++ b/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; } |