commit c5a17fc39fd22cd1dbf7483bbfd7e76f101d99c2
author Tao Bao <tbao@google.com> Mon Aug 29 19:26:43 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 29 19:26:43 2016 +0000
tree 7f1b66d7eaa3f0334a200c6d531095e2c6fbc8a4
parent 128a4419e92ad3bcbbbf29d4ab1550220799b59c
parent 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded

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

Change-Id: I35340614fe09f96f8c31cc53a99e366580294490

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;