From c774dcee9dd7c57821710f253bce5bd80bbecb0a Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Thu, 22 May 2014 12:40:25 -0700 Subject: [PATCH] Increase start timeout for wrapped process * apparently 300*1000 for valgrind is not enough (hammerhead aosp tot). Change-Id: Ia3f26cb67d3aa0ebdec68f3c1a764bad5e7f4f95 --- services/java/com/android/server/am/ActivityManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 3df1698bb1f5a..8a32bfdb1edb9 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;