aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2015-03-20 22:17:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 22:17:10 +0000
commitfc2a7dfe9350400514c8e21023ea2ef46266f712 (patch)
treed645d524e8c101ea69acdae0f297d94e19cc8055
parentd08f74908ccebd13ebd5298554320aea94da55a0 (diff)
parent35e336b1c6378da70c891ad68ebee662414b52c1 (diff)
downloadsdk-fc2a7dfe9350400514c8e21023ea2ef46266f712.zip
sdk-fc2a7dfe9350400514c8e21023ea2ef46266f712.tar.gz
sdk-fc2a7dfe9350400514c8e21023ea2ef46266f712.tar.bz2
am 35e336b1: am 956b01fd: Merge "gltrace: Increase launch timeout" into idea133 automerge: 1d55d41
* commit '35e336b1c6378da70c891ad68ebee662414b52c1': gltrace: Increase launch timeout
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java
index f28e0f0..2d204eb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java
@@ -70,7 +70,7 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate {
private static final String SYSTEM_APP = "system"; //$NON-NLS-1$
/** Time to wait for the application to launch (seconds) */
- private static final int LAUNCH_TIMEOUT = 5;
+ private static final int LAUNCH_TIMEOUT = 15;
/** Time to wait for the application to die (seconds) */
private static final int KILL_TIMEOUT = 5;