diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-05-23 02:31:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-23 02:31:37 +0000 |
| commit | d5ee4144c4beae54219e1b8eb10418b02dd4a63b (patch) | |
| tree | c126623b20b783e90412b96992cb64c07e3b5097 /services/java | |
| parent | a0166b58de38e0d2d67f9d847d307cf3ce7bf633 (diff) | |
| parent | c774dcee9dd7c57821710f253bce5bd80bbecb0a (diff) | |
| download | frameworks_base-d5ee4144c4beae54219e1b8eb10418b02dd4a63b.zip frameworks_base-d5ee4144c4beae54219e1b8eb10418b02dd4a63b.tar.gz frameworks_base-d5ee4144c4beae54219e1b8eb10418b02dd4a63b.tar.bz2 | |
Merge "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 3df1698..8a32bfd 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; |