diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-04-26 11:18:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-26 11:18:45 -0700 |
| commit | 0ff9212d077e77f8b3e0afa232293306c0f72d07 (patch) | |
| tree | c19a346e89f714312e3d124f0f222e9ae8fd544c | |
| parent | 31431b34f895862ae13efba30bb5771085572687 (diff) | |
| parent | 19681af44b7c7494ae8de28dab8aacc3e9d92390 (diff) | |
| download | frameworks_base-0ff9212d077e77f8b3e0afa232293306c0f72d07.zip frameworks_base-0ff9212d077e77f8b3e0afa232293306c0f72d07.tar.gz frameworks_base-0ff9212d077e77f8b3e0afa232293306c0f72d07.tar.bz2 | |
am 19681af4: Merge "Handle throttling being disabled via policy change" into froyo
Merge commit '19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp
* commit '19681af44b7c7494ae8de28dab8aacc3e9d92390':
Handle throttling being disabled via policy change
| -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; } |