diff options
| author | Tao Bao <tbao@google.com> | 2016-08-26 20:52:41 -0700 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2016-08-29 12:25:59 -0700 |
| commit | b8c722be74acca446c192cca48c18433079a6031 (patch) | |
| tree | 7ee3c280e94cba413175f94369f383bc7d758802 | |
| parent | 6d85c4cb539a0ecd0ef26d21f47c8acff70816b5 (diff) | |
| download | base-marshmallow-dr1.6-release.tar.gz | |
Bump up the uncrypt timeout to 30 min.android-6.0.1_r68marshmallow-dr1.6-release
Bug: 30490464
Change-Id: I9b65afb10134d79b2f5b5275a6d81065a04e91b9
(cherry picked from commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded)
| -rw-r--r-- | services/core/java/com/android/server/power/ShutdownThread.java | 2 |
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; |