commit e0dd9516b516bc9042ad5d6f4b7fef053ce07d0e
author Michael Runge <mrunge@google.com> Wed Dec 17 14:14:12 2014 -0800
committer The Android Automerger <android-build@google.com> Fri Mar 27 07:37:46 2015 -0700
tree b3cee83e9585afe7a755559fdeccca6751616dc5
parent 0ac9664a9ee2e6d1d3b68fe00c264ad94fe98966

Increase timeout when uncrypting OTA

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)

services/core/java/com/android/server/power/PowerManagerService.java

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 52807c0..141b85c 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 @@
             //
             // 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;