frameworks/base
| 修订版 | 4251cae68af974e5d5db00b1df2a0a481a86c3f7 (tree) |
|---|---|
| 时间 | 2015-10-28 02:38:31 |
| 作者 | Tao Bao <tbao@goog...> |
| Commiter | The Android Automerger |
[DO NOT MERGE] Bump up the timeout for uncrypt to 900s.
Bug: 23629892
Change-Id: I7b722f1b3f43a31dc82c55127c46df6123f14b5d
| @@ -2357,7 +2357,7 @@ public final class PowerManagerService extends SystemService | ||
| 2357 | 2357 | /** |
| 2358 | 2358 | * Low-level function to reboot the device. On success, this |
| 2359 | 2359 | * function doesn't return. If more than 20 seconds passes from |
| 2360 | - * the time a reboot is requested (120 seconds for reboot to | |
| 2360 | + * the time a reboot is requested (900 seconds for reboot to | |
| 2361 | 2361 | * recovery), this method returns. |
| 2362 | 2362 | * |
| 2363 | 2363 | * @param reason code to pass to the kernel (e.g. "recovery"), or null. |
| @@ -2375,9 +2375,11 @@ public final class PowerManagerService extends SystemService | ||
| 2375 | 2375 | // |
| 2376 | 2376 | // This preparation can take more than 20 seconds if |
| 2377 | 2377 | // there's a very large update package, so lengthen the |
| 2378 | - // timeout. We have seen 750MB packages take 3-4 minutes | |
| 2378 | + // timeout. We have seen 750MB packages take 3-4 minutes. | |
| 2379 | + // Bump up the limit again to 900s for really large packages. | |
| 2380 | + // Bug: 23629892. | |
| 2379 | 2381 | SystemProperties.set("ctl.start", "pre-recovery"); |
| 2380 | - duration = 300 * 1000L; | |
| 2382 | + duration = 900 * 1000L; | |
| 2381 | 2383 | } else { |
| 2382 | 2384 | SystemProperties.set("sys.powerctl", "reboot," + reason); |
| 2383 | 2385 | duration = 20 * 1000L; |
Fork
services/core/java/com/android/server/power/PowerManagerService.java