summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tao Bao <tbao@google.com> 2016-08-29 19:34:23 +0000
committer android-build-merger <android-build-merger@google.com> 2016-08-29 19:34:23 +0000
commit18f9533910d019c844b8105faba08b9a8a0e02b4 (patch)
treeb10187d83215028bf2140c33c6cd049ed4219fe7
parent934da4e4000e6b7eeb203a2cb3bb0d0975f7e769 (diff)
parentc5a17fc39fd22cd1dbf7483bbfd7e76f101d99c2 (diff)
Bump up the uncrypt timeout to 30 min. am: 8abcfed8a4
am: c5a17fc39f Change-Id: Ib637e1f00ddebbac5a3bea6ff31f08854a95b7ea
-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 8ce2fd9c2a83..3d2839ff4448 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 @@ 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;