Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: 8deabad

* commit '8deabad541984571496456646d6a7a91eccc9e42':
  Increase timeout when uncrypting OTA
This commit is contained in:
Michael Runge
2014-12-18 01:59:10 +00:00
committed by android-build-merger
parent 3a586c032c 8deabad541
commit 647beed622
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -2375,9 +2375,9 @@ public final class PowerManagerService extends SystemService
// //
// This preparation can take more than 20 seconds if // This preparation can take more than 20 seconds if
// there's a very large update package, so lengthen the // 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"); SystemProperties.set("ctl.start", "pre-recovery");
duration = 120 * 1000L; duration = 300 * 1000L;
} else { } else {
SystemProperties.set("sys.powerctl", "reboot," + reason); SystemProperties.set("sys.powerctl", "reboot," + reason);
duration = 20 * 1000L; duration = 20 * 1000L;