commit b8c722be74acca446c192cca48c18433079a6031
author Tao Bao <tbao@google.com> Fri Aug 26 20:52:41 2016 -0700
committer gitbuildkicker <android-build@google.com> Mon Aug 29 12:25:59 2016 -0700
tree 7ee3c280e94cba413175f94369f383bc7d758802
parent 6d85c4cb539a0ecd0ef26d21f47c8acff70816b5

Bump up the uncrypt timeout to 30 min.

Bug: 30490464
Change-Id: I9b65afb10134d79b2f5b5275a6d81065a04e91b9
(cherry picked from commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded)

services/core/java/com/android/server/power/ShutdownThread.java

diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java
index dd8648d..c94aeb9 100644
--- a/services/core/java/com/android/server/power/ShutdownThread.java
+++ b/services/core/java/com/android/server/power/ShutdownThread.java
@@ -66,7 +66,7 @@
     private static final int MAX_BROADCAST_TIME = 10*1000;
     private static final int MAX_SHUTDOWN_WAIT_TIME = 20*1000;
     private static final int MAX_RADIO_WAIT_TIME = 12*1000;
-    private static final int MAX_UNCRYPT_WAIT_TIME = 15*60*1000;
+    private static final int MAX_UNCRYPT_WAIT_TIME = 30*60*1000;
     // constants for progress bar. the values are roughly estimated based on timeout.
     private static final int BROADCAST_STOP_PERCENT = 2;
     private static final int ACTIVITY_MANAGER_STOP_PERCENT = 4;