diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-08-18 16:50:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-08-18 16:50:26 +0000 |
| commit | 956b01fd91a6a576e8c8e35b2d608408e866c5da (patch) | |
| tree | b84c9534e2f8011ede49677135283e546c389627 /eclipse | |
| parent | 39f4d6778f7597af9d416db62a677cce153cf84b (diff) | |
| parent | 1d55d413646dfc6f4d95e4f74a5bfdd7ed1c23cd (diff) | |
| download | replicant_sdk-956b01fd91a6a576e8c8e35b2d608408e866c5da.zip replicant_sdk-956b01fd91a6a576e8c8e35b2d608408e866c5da.tar.gz replicant_sdk-956b01fd91a6a576e8c8e35b2d608408e866c5da.tar.bz2 | |
Merge "gltrace: Increase launch timeout" into idea133
automerge: 1d55d41
* commit '1d55d413646dfc6f4d95e4f74a5bfdd7ed1c23cd':
gltrace: Increase launch timeout
Diffstat (limited to 'eclipse')
| -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; |