From 3ee9945be3adc94fea7c01129014bc8d848df0a1 Mon Sep 17 00:00:00 2001 From: Zach Jang Date: Wed, 16 Sep 2015 01:38:41 +0000 Subject: [PATCH] Revert "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" This reverts commit 3b49affdb3e18bbe48fc7ab00ccbe2c073b7e35e. Change-Id: I8639fc6865081f6b1a5773b884f8298cce0d3e7d --- .../com/android/server/power/PowerManagerService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 9786b42ec30c8..9371222c7af10 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -2357,7 +2357,7 @@ public final class PowerManagerService extends SystemService /** * Low-level function to reboot the device. On success, this * function doesn't return. If more than 20 seconds passes from - * the time a reboot is requested (120 seconds for reboot to + * the time a reboot is requested (900 seconds for reboot to * recovery), this method returns. * * @param reason code to pass to the kernel (e.g. "recovery"), or null. @@ -2375,9 +2375,11 @@ public final class PowerManagerService extends SystemService // // This preparation can take more than 20 seconds if // there's a very large update package, so lengthen the - // timeout. We have seen 750MB packages take 3-4 minutes + // timeout. We have seen 750MB packages take 3-4 minutes. + // Bump up the limit again to 900s for really large packages. + // Bug: 23629892. SystemProperties.set("ctl.start", "pre-recovery"); - duration = 300 * 1000L; + duration = 900 * 1000L; } else { SystemProperties.set("sys.powerctl", "reboot," + reason); duration = 20 * 1000L;