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

am 2137d6a8: am d5ee4144: Merge "Increase start timeout for wrapped process"

Browse Source 
* commit '2137d6a843b82996e08f0e03376e48860919d8bc':
  Increase start timeout for wrapped process
This commit is contained in:
Dmitriy Ivanov
2014-05-23 02:40:42 +00:00
committed by Android Git Automerger
parent 8c0660c257 2137d6a843
commit 190ed5db4a
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/am/ActivityManagerService.java
View File

@@ -273,7 +273,7 @@ public final class ActivityManagerService extends ActivityManagerNative
// before we decide it's never going to come up for real, when the process was
// started with a wrapper for instrumentation (such as Valgrind) because it
// could take much longer than usual.
static final int PROC_START_TIMEOUT_WITH_WRAPPER = 300*1000;
static final int PROC_START_TIMEOUT_WITH_WRAPPER = 1200*1000;
// How long to wait after going idle before forcing apps to GC.
static final int GC_TIMEOUT = 5*1000;