diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-05-23 02:35:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 02:35:42 +0000 |
| commit | 2137d6a843b82996e08f0e03376e48860919d8bc (patch) | |
| tree | 0d15e1fca1c4f8a84e3064ce58b5cddbb718d310 /services/java | |
| parent | d6d7587ab09e4a0eae9252e11ab59ad27af68823 (diff) | |
| parent | d5ee4144c4beae54219e1b8eb10418b02dd4a63b (diff) | |
| download | frameworks_base-2137d6a843b82996e08f0e03376e48860919d8bc.zip frameworks_base-2137d6a843b82996e08f0e03376e48860919d8bc.tar.gz frameworks_base-2137d6a843b82996e08f0e03376e48860919d8bc.tar.bz2 | |
am d5ee4144: Merge "Increase start timeout for wrapped process"
* commit 'd5ee4144c4beae54219e1b8eb10418b02dd4a63b':
Increase start timeout for wrapped process
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 2150aa9..80145c7 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -268,7 +268,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; |