diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-08-18 16:59:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-18 16:59:10 +0000 |
| commit | 35e336b1c6378da70c891ad68ebee662414b52c1 (patch) | |
| tree | b84c9534e2f8011ede49677135283e546c389627 | |
| parent | 44021bc2138bd92889328f699887fafa40e2ecc6 (diff) | |
| parent | 956b01fd91a6a576e8c8e35b2d608408e866c5da (diff) | |
| download | sdk-35e336b1c6378da70c891ad68ebee662414b52c1.zip sdk-35e336b1c6378da70c891ad68ebee662414b52c1.tar.gz sdk-35e336b1c6378da70c891ad68ebee662414b52c1.tar.bz2 | |
am 956b01fd: Merge "gltrace: Increase launch timeout" into idea133 automerge: 1d55d41
* commit '956b01fd91a6a576e8c8e35b2d608408e866c5da':
gltrace: Increase launch timeout
| -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; |