diff options
author | Tao Bao <tbao@google.com> | 2015-08-28 17:46:20 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2015-09-01 14:21:02 -0700 |
commit | f4736a7ead342f7b456c0e0e7efd9d2a2ffe50cf (patch) | |
tree | 891cbe99fe129a270a5d9ffb2af7ecc9b8ddff60 | |
parent | b3145760db5d58a107fd1ffd8eeec67d983d45f3 (diff) | |
download | base-f4736a7ead342f7b456c0e0e7efd9d2a2ffe50cf.tar.gz |
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.android-5.1.1_r20android-5.1.1_r19
Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
-rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 8 |
1 files 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 9786b42ec30c..9371222c7af1 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; |