commit 96f47f5bf3f498a7a85721de2e265d8fa3e9af26
author Michael Runge <mrunge@google.com> Thu Mar 26 03:57:33 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 26 03:57:33 2015 +0000
tree 6d16142304003d64521372fcc0eb8faebc393f40
parent 44b5a1c8471ef5e1cd3dcfffec5a9e439f228766
parent b019703395ae0304ddd10054843c64db87229d23

am b0197033: Increase timeout when uncrypting OTA

* commit 'b019703395ae0304ddd10054843c64db87229d23':
  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 545a7fd..72f746a 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;