summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tao Bao <tbao@google.com> 2016-08-26 20:52:41 -0700
committer Tao Bao <tbao@google.com> 2016-08-26 20:52:41 -0700
commit8abcfed8a42a1ca517ee3c8d0448fda669ff9ded (patch)
tree3424ae6bd5a7f3baf7f22e86d4209c37e0caa876
parent7a46fac0cd843c955d50e30af097f3e447da5a9b (diff)
Bump up the uncrypt timeout to 30 min.
Bug: 30490464 Change-Id: I9b65afb10134d79b2f5b5275a6d81065a04e91b9
-rw-r--r--services/core/java/com/android/server/power/ShutdownThread.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java
index dd8648d60d8f..c94aeb97ebc7 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 @@ public final class ShutdownThread extends Thread {
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;