diff options
| author | 2018-05-09 16:54:17 +0000 | |
|---|---|---|
| committer | 2018-05-09 16:54:17 +0000 | |
| commit | d99e347f39795d1be40e667ece531d961bfcc0db (patch) | |
| tree | 42be096a12ce6775eb85a5d84d32cd201afa429b | |
| parent | b69f7c9e0b3d47fc295c9b4a59ebd80d5cbaf3b9 (diff) | |
| parent | 85fff7d2f8a34c3e7724597b19c80c85b3d00e07 (diff) | |
Merge "Changed doze-light timeouts" into pi-dev
| -rw-r--r-- | services/core/java/com/android/server/DeviceIdleController.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java index a4d0dc87120b..74b45436aabd 100644 --- a/services/core/java/com/android/server/DeviceIdleController.java +++ b/services/core/java/com/android/server/DeviceIdleController.java @@ -812,9 +812,9 @@ public class DeviceIdleController extends SystemService LIGHT_IDLE_AFTER_INACTIVE_TIMEOUT = mParser.getDurationMillis( KEY_LIGHT_IDLE_AFTER_INACTIVE_TIMEOUT, - !COMPRESS_TIME ? 5 * 60 * 1000L : 15 * 1000L); + !COMPRESS_TIME ? 3 * 60 * 1000L : 15 * 1000L); LIGHT_PRE_IDLE_TIMEOUT = mParser.getDurationMillis(KEY_LIGHT_PRE_IDLE_TIMEOUT, - !COMPRESS_TIME ? 10 * 60 * 1000L : 30 * 1000L); + !COMPRESS_TIME ? 3 * 60 * 1000L : 30 * 1000L); LIGHT_IDLE_TIMEOUT = mParser.getDurationMillis(KEY_LIGHT_IDLE_TIMEOUT, !COMPRESS_TIME ? 5 * 60 * 1000L : 15 * 1000L); LIGHT_IDLE_FACTOR = mParser.getFloat(KEY_LIGHT_IDLE_FACTOR, |