diff options
| author | 2015-08-31 20:40:48 +0000 | |
|---|---|---|
| committer | 2015-08-31 20:40:48 +0000 | |
| commit | 937b0978be5cda5ab4e12bc277dad42cde0e27b6 (patch) | |
| tree | d084e69509439118da43dd4379fc197e29036a2a | |
| parent | 15d5283ce8dfbac5c74c5039aab8c6fddc38df5f (diff) | |
| parent | aaebdd7f91163382065d3b56d57cafef5e46c7fd (diff) | |
am aaebdd7f: am 02be9316: am 06fb3b2d: am 0e2e8589: Merge "Don\'t throttle "while idle" alarms while not dozing" into mnc-dev
* commit 'aaebdd7f91163382065d3b56d57cafef5e46c7fd':
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 4288fa2668dc..882899e4fe96 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; |