commit 3fa2307254a5f52369d0074fb87ca9cbc443d182
author Michael Runge <mrunge@google.com> Thu Dec 18 02:08:44 2014 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 18 02:08:44 2014 +0000
tree 7af846e80c52b8d35569865dc26231fbb3c0193d
parent 9f93e272da162d416878b902c11490a37afc1a2e
parent 647beed62236c996b946e85d06fdf4335b6a2a80

am 37fed329: Merge "Increase timeout when uncrypting OTA" into lmp-mr1-dev automerge: 8deabad
automerge: 647beed

* commit '647beed62236c996b946e85d06fdf4335b6a2a80':
  Increase timeout when uncrypting OTA

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 4d1ab4c..9786b42 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -2375,9 +2375,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;