2 files changed, 8 insertions, 24 deletions
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
index f397b1f..77f8d74 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
@@ -90,11 +90,11 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
     }
 
     /**
-     * Init the DeviceBridge with an existing {@link AndroidDebugBridge}. This loops until
-     * a bridge exists or a timeout is reached.
+     * Init the DeviceBridge with an existing {@link AndroidDebugBridge}.
+     * @param bridge the bridge object to use
      */
-    public boolean acquireBridge() {
-        return DeviceBridge.acquireBridge();
+    public void acquireBridge(AndroidDebugBridge bridge) {
+        DeviceBridge.acquireBridge(bridge);
     }
 
     /**
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java
index 74fbc13..40cc3a9 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java
@@ -81,27 +81,11 @@ public class DeviceBridge {
     }
 
     /**
-     * Init the DeviceBridge with an existing {@link AndroidDebugBridge}. This loops until
-     * a bridge exists or a timeout is reached.
+     * Init the DeviceBridge with an existing {@link AndroidDebugBridge}.
+     * @param bridge the bridge object to use
      */
-    public static boolean acquireBridge() {
-        int count = 10;
-        do {
-            sBridge = AndroidDebugBridge.getBridge();
-            if (sBridge == null) {
-                try {
-                    Thread.sleep(500);
-                    count--;
-                    if (count == 0) {
-                        return false;
-                    }
-                } catch (InterruptedException e) {
-                    // pass
-                }
-            }
-        } while (sBridge == null);
-
-        return true;
+    public static void acquireBridge(AndroidDebugBridge bridge) {
+        sBridge = bridge;
     }
 
     /**