Snap for 4687194 from ba7115c2667d6d138633ab1f2d44819a01c299f1 to studio-3.2-releasestudio-3.2.1studio-master-devmirror-goog-studio-master-dev

Change-Id: I0b680b88df2d7c41d3b5e2dd43292e8eac42d9b6

1 files changed, 3 insertions, 2 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 c13ab461b..f312cc473 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
@@ -56,6 +56,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.net.Socket;
 import java.util.concurrent.Callable;
+import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
@@ -340,7 +341,7 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate {
             }
         };
         try {
-            new SimpleTimeLimiter().callWithTimeout(c, timeout, TimeUnit.SECONDS, true);
+            SimpleTimeLimiter.create(Executors.newCachedThreadPool()).callWithTimeout(c, timeout, TimeUnit.SECONDS);
         } catch (Exception e) {
             throw new RuntimeException("Timed out waiting for application to launch.");
         }
@@ -366,7 +367,7 @@ public class CollectTraceAction implements IWorkbenchWindowActionDelegate {
             }
         };
         try {
-            new SimpleTimeLimiter().callWithTimeout(c, timeout, TimeUnit.SECONDS, true);
+            SimpleTimeLimiter.create(Executors.newCachedThreadPool()).callWithTimeout(c, timeout, TimeUnit.SECONDS);
         } catch (Exception e) {
             throw new RuntimeException("Timed out waiting for running application to die.");
         }