diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-05-22 12:40:25 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-05-22 12:40:25 -0700 |
| commit | c774dcee9dd7c57821710f253bce5bd80bbecb0a (patch) | |
| tree | f7d9e410b85265c801adf8c70230a4b6ca0917a8 | |
| parent | fc1ffe89db4bfe51856dadead2ed9c856a96ca65 (diff) | |
| download | base-c774dcee9dd7c57821710f253bce5bd80bbecb0a.tar.gz | |
Increase start timeout for wrapped process
* apparently 300*1000 for valgrind is not enough
(hammerhead aosp tot).
Change-Id: Ia3f26cb67d3aa0ebdec68f3c1a764bad5e7f4f95
| -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 3df1698bb1f5..8a32bfdb1edb 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; |