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

automerge: 647beed

* commit '647beed62236c996b946e85d06fdf4335b6a2a80':
  Increase timeout when uncrypting OTA
This commit is contained in:
Michael Runge
2014-12-18 02:08:44 +00:00
committed by android-build-merger

View File

@@ -2375,9 +2375,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;