commit 8c682f84415f9430ce58f5d7a8eedd49c1794c70
author Tao Bao <tbao@google.com> Mon Aug 29 19:33:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 29 19:33:29 2016 +0000
tree 569e4b811b929d5a95e29c9ba3cbd1ec4848e70d
parent 6a1dd431942e195d60cb40b3ccdd783d9f90be25
parent c5a17fc39fd22cd1dbf7483bbfd7e76f101d99c2

Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4
am: c5a17fc39f

Change-Id: Ie634af4f18044ffaf98c21149c1635b6ad8b9a3f

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 5b9d139..27d1671 100644
--- a/services/core/java/com/android/server/power/ShutdownThread.java
+++ b/services/core/java/com/android/server/power/ShutdownThread.java
@@ -68,7 +68,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;