diff options
| author | Michael Runge <mrunge@google.com> | 2014-12-17 14:14:12 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-03-27 07:37:46 -0700 |
| commit | e0dd9516b516bc9042ad5d6f4b7fef053ce07d0e (patch) | |
| tree | b3cee83e9585afe7a755559fdeccca6751616dc5 | |
| parent | 0ac9664a9ee2e6d1d3b68fe00c264ad94fe98966 (diff) | |
| download | base-lollipop-release.tar.gz | |
Increase timeout when uncrypting OTAandroid-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3lollipop-releaselollipop-cts-release
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.
Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
(cherry picked from commit 01c06dfb076b71cb72c4bff9175bec9d59d2efde)
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 52807c025a3a..141b85c636b5 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -2293,9 +2293,9 @@ 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. + // timeout. We have seen 750MB packages take 3-4 minutes SystemProperties.set("ctl.start", "pre-recovery"); - duration = 120 * 1000L; + duration = 300 * 1000L; } else { SystemProperties.set("sys.powerctl", "reboot," + reason); duration = 20 * 1000L; |