diff options
| author | Bart Sears <bsears@google.com> | 2015-08-31 20:02:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 20:02:34 +0000 |
| commit | 06fb3b2da8a57fdc5efe24ab9464e6e890740de6 (patch) | |
| tree | 0dd9fb0e008b822928e491f62915f1136b26f2d0 /services | |
| parent | d833cb54537b81d49b6563afb7583d4b36e19c51 (diff) | |
| parent | 0e2e85898743a070a0c42036fa9d841694819a00 (diff) | |
| download | frameworks_base-06fb3b2da8a57fdc5efe24ab9464e6e890740de6.zip frameworks_base-06fb3b2da8a57fdc5efe24ab9464e6e890740de6.tar.gz frameworks_base-06fb3b2da8a57fdc5efe24ab9464e6e890740de6.tar.bz2 | |
am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '0e2e85898743a070a0c42036fa9d841694819a00':
Don't throttle "while idle" alarms while not dozing
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/AlarmManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index d58d372..e3d5d38 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -177,7 +177,7 @@ class AlarmManagerService extends SystemService { private static final long DEFAULT_MIN_FUTURITY = 5 * 1000; private static final long DEFAULT_MIN_INTERVAL = 60 * 1000; - private static final long DEFAULT_ALLOW_WHILE_IDLE_SHORT_TIME = 60*1000; + private static final long DEFAULT_ALLOW_WHILE_IDLE_SHORT_TIME = DEFAULT_MIN_FUTURITY; private static final long DEFAULT_ALLOW_WHILE_IDLE_LONG_TIME = 15*60*1000; private static final long DEFAULT_ALLOW_WHILE_IDLE_WHITELIST_DURATION = 10*1000; |