diff options
| author | Michael Runge <mrunge@google.com> | 2014-12-17 14:14:12 -0800 |
|---|---|---|
| committer | Michael Runge <mrunge@google.com> | 2014-12-17 14:14:12 -0800 |
| commit | 01c06dfb076b71cb72c4bff9175bec9d59d2efde (patch) | |
| tree | aad2f77e6cfd212fa6635b9ebd9118cafd3efddd /services | |
| parent | fcae79f65d60069f75c4db92a68d56c9eb8b5213 (diff) | |
| download | frameworks_base-01c06dfb076b71cb72c4bff9175bec9d59d2efde.zip frameworks_base-01c06dfb076b71cb72c4bff9175bec9d59d2efde.tar.gz frameworks_base-01c06dfb076b71cb72c4bff9175bec9d59d2efde.tar.bz2 | |
Increase timeout when uncrypting OTA
Larger OTAs (750 MB tested) are taking 3-4 minutes
to write, due to the O_SYNC needed to ensure that
the data is actually committed to disk prior to
reboot.
Bug: 18750317
Change-Id: Idfab3ffd0276df4548f69a09c72ad6f4a344b6e6
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 4d1ab4c..9786b42 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 @@ 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; |