summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Seaton <aseaton@google.com> 2016-08-30 22:14:47 +0000
committer Adam Seaton <aseaton@google.com> 2016-08-30 22:14:47 +0000
commitb57e6560d0cc8d11b0845296831e4421d85d4441 (patch)
treec1650dd37e4fce9ffa7595930f8c701dac4f69d6
parent8abcfed8a42a1ca517ee3c8d0448fda669ff9ded (diff)
Revert "Bump up the uncrypt timeout to 30 min."
Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a42a1ca517ee3c8d0448fda669ff9ded. Change-Id: I64474dad467ce8d8e379e0e2c47814d76ac0ee0d
-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 c94aeb97ebc7..dd8648d60d8f 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 = 30*60*1000;
+ private static final int MAX_UNCRYPT_WAIT_TIME = 15*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;