Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Bump up the uncrypt timeout to 30 min." Creates Null Build to test OTA failure fix. This reverts commit 8abcfed8a4. am: b57e6560d0 am: e245037327 am: 1ceb0fcf3a

Browse Source 
am: cb3c7d3b0e

Change-Id: I009991aae750226f9596af2969428de85c6e4412
This commit is contained in:
Adam Seaton
2016-08-30 23:46:45 +00:00
committed by android-build-merger
parent e14c73cc17 cb3c7d3b0e
commit c37d7a4756
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/power/ShutdownThread.java
View File

@@ -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 = 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;