diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-08-18 16:48:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:08:14 +0000 |
| commit | 1d55d413646dfc6f4d95e4f74a5bfdd7ed1c23cd (patch) | |
| tree | 69dc45f2f4786f32e895bf5400379d3ca0692d98 | |
| parent | b0e06f6fcfc02a35f086367ccef8294b0f9376e3 (diff) | |
| parent | 06459c751d6daa3948e01dfae0793754ffe80ef5 (diff) | |
| download | sdk-1d55d413646dfc6f4d95e4f74a5bfdd7ed1c23cd.zip sdk-1d55d413646dfc6f4d95e4f74a5bfdd7ed1c23cd.tar.gz sdk-1d55d413646dfc6f4d95e4f74a5bfdd7ed1c23cd.tar.bz2 | |
Merge "gltrace: Increase launch timeout" into idea133
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gltrace/CollectTraceAction.java | 2 |
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; |