diff options
| author | 2015-08-31 20:16:53 +0000 | |
|---|---|---|
| committer | 2015-08-31 20:16:53 +0000 | |
| commit | 02be93160a246323f0a17f831e4e8bf56d65d415 (patch) | |
| tree | 6da51e95b786cceba41e9fd10f3e742d1c6d1d3c | |
| parent | 3bd58233ab3ec8509a3f8922344ae30a330f5159 (diff) | |
| parent | 06fb3b2da8a57fdc5efe24ab9464e6e890740de6 (diff) | |
am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit '06fb3b2da8a57fdc5efe24ab9464e6e890740de6':
Don't throttle "while idle" alarms while not dozing
| -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 d58d3721d803..e3d5d38d9a64 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; |