drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 203b4354: Merge "Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."" into lmp-mr1-dev

Browse Source 
* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."
This commit is contained in:
Zach Jang
2015-09-16 01:44:53 +00:00
committed by Android Git Automerger
parent dd21212fa1 203b43547d
commit 00db082656
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2357,7 +2357,7 @@ public final class PowerManagerService extends SystemService
/** /**
* Low-level function to reboot the device. On success, this * Low-level function to reboot the device. On success, this
* function doesn't return. If more than 20 seconds passes from * function doesn't return. If more than 20 seconds passes from
* the time a reboot is requested (900 seconds for reboot to * the time a reboot is requested (120 seconds for reboot to
* recovery), this method returns. * recovery), this method returns.
* *
* @param reason code to pass to the kernel (e.g. "recovery"), or null. * @param reason code to pass to the kernel (e.g. "recovery"), or null.
@ -2375,11 +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. We have seen 750MB packages take 3-4 minutes. // timeout. We have seen 750MB packages take 3-4 minutes
// Bump up the limit again to 900s for really large packages.
// Bug: 23629892.
SystemProperties.set("ctl.start", "pre-recovery"); SystemProperties.set("ctl.start", "pre-recovery");
duration = 900 * 1000L; duration = 300 * 1000L;
} else { } else {
SystemProperties.set("sys.powerctl", "reboot," + reason); SystemProperties.set("sys.powerctl", "reboot," + reason);
duration = 20 * 1000L; duration = 20 * 1000L;