diff options
author | Xavier Ducrohet <xav@android.com> | 2010-09-03 17:14:29 -0700 |
---|---|---|
committer | Xavier Ducrohet <xav@android.com> | 2010-09-03 17:25:49 -0700 |
commit | 0b21937765ca5307a6a7e244ba4eddd36954b9cf (patch) | |
tree | 0158022cbfffe20f234920a61514c814d1ea59c3 /hierarchyviewer2 | |
parent | d739049a624f4492bf292cde501af39a77b01624 (diff) | |
download | sdk-0b21937765ca5307a6a7e244ba4eddd36954b9cf.zip sdk-0b21937765ca5307a6a7e244ba4eddd36954b9cf.tar.gz sdk-0b21937765ca5307a6a7e244ba4eddd36954b9cf.tar.bz2 |
DDMS now receives the adb location through an extension point.
Previously DDMS received the adb location through a normal Java API
which requires the other plug-in to be actually running (This
was done in the the start method of ADT).
The new change allows DDMS to start a plug-in (by loading
an extension provided by the plug-in) to query for the location
of adb.
This allows us to have plug-ins with no UI able to provide
the location of ADB (ie a "platform" plug-in that has no UI
besides a pref page, that is started by DDMS indirectly).
Also cleaned up how HierarchyViewer use the AndroidDebugBridge.
Change-Id: I8e842a294eea94c06417149144a2ce435e719cfd
Diffstat (limited to 'hierarchyviewer2')
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; } /** |