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

* commit '203b43547da94c9fb78931680b99f9db49fc46c9':
  Revert "[DO NOT MERGE] Bump up the timeout for uncrypt to 900s."

1 files changed, 3 insertions, 5 deletions

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 9371222c7af1..9786b42ec30c 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -2357,7 +2357,7 @@ public final class PowerManagerService extends SystemService
     /**
      * Low-level function to reboot the device. On success, this
      * 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.
      *
      * @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
             // there's a very large update package, so lengthen the
-            // timeout.  We have seen 750MB packages take 3-4 minutes.
-            // Bump up the limit again to 900s for really large packages.
-            // Bug: 23629892.
+            // timeout.  We have seen 750MB packages take 3-4 minutes
             SystemProperties.set("ctl.start", "pre-recovery");
-            duration = 900 * 1000L;
+            duration = 300 * 1000L;
         } else {
             SystemProperties.set("sys.powerctl", "reboot," + reason);
             duration = 20 * 1000L;