Merge "hv: Initialize adb with client support only when necessary"android-4.3_r2.1android-4.3_r2android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9jb-mr2.0-releasejb-mr2-releasejb-mr2-dev

3 files changed, 14 insertions, 6 deletions

diff --git a/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/HierarchyViewerDirector.java b/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
index cba35f2..7c0adce 100644
--- a/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
+++ b/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
@@ -58,6 +58,11 @@ import java.util.TimerTask;
  */
 public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
         IWindowChangeListener {
+    private static final boolean sIsUsingDdmProtocol;
+    static {
+        String sHvProtoEnvVar = System.getenv("ANDROID_HVPROTO"); //$NON-NLS-1$
+        sIsUsingDdmProtocol = "ddm".equalsIgnoreCase(sHvProtoEnvVar);
+    }
 
     protected static HierarchyViewerDirector sDirector;
 
@@ -80,6 +85,10 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
     private static final Object mDevicesLock = new Object();
     private Map<IDevice, IHvDevice> mDevices = new HashMap<IDevice, IHvDevice>(10);
 
+    public static boolean isUsingDdmProtocol() {
+        return sIsUsingDdmProtocol;
+    }
+
     public void terminate() {
         WindowUpdater.terminate();
         mPixelPerfectRefreshTimer.cancel();
diff --git a/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/device/DeviceBridge.java b/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/device/DeviceBridge.java
index 30fa6f6..ca3627b 100644
--- a/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/device/DeviceBridge.java
+++ b/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/device/DeviceBridge.java
@@ -23,6 +23,7 @@ import com.android.ddmlib.Log;
 import com.android.ddmlib.MultiLineReceiver;
 import com.android.ddmlib.ShellCommandUnresponsiveException;
 import com.android.ddmlib.TimeoutException;
+import com.android.hierarchyviewerlib.HierarchyViewerDirector;
 import com.android.hierarchyviewerlib.models.ViewNode;
 import com.android.hierarchyviewerlib.models.Window;
 import com.android.hierarchyviewerlib.ui.util.PsdFile;
@@ -99,7 +100,8 @@ public class DeviceBridge {
      */
     public static void initDebugBridge(String adbLocation) {
         if (sBridge == null) {
-            AndroidDebugBridge.init(true /* debugger support */);
+            /* debugger support required only if hv is using ddm protocol */
+            AndroidDebugBridge.init(HierarchyViewerDirector.isUsingDdmProtocol());
         }
         if (sBridge == null || !sBridge.isConnected()) {
             sBridge = AndroidDebugBridge.createBridge(adbLocation, true);
diff --git a/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/device/HvDeviceFactory.java b/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/device/HvDeviceFactory.java
index 24a5a4f..81f567b 100644
--- a/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/device/HvDeviceFactory.java
+++ b/hierarchyviewer2/hierarchyviewer2lib/src/main/java/com/android/hierarchyviewerlib/device/HvDeviceFactory.java
@@ -19,15 +19,12 @@ package com.android.hierarchyviewerlib.device;
 import com.android.ddmlib.Client;
 import com.android.ddmlib.ClientData;
 import com.android.ddmlib.IDevice;
+import com.android.hierarchyviewerlib.HierarchyViewerDirector;
 
 public class HvDeviceFactory {
-    private static final String sHvProtoEnvVar =
-            System.getenv("ANDROID_HVPROTO"); //$NON-NLS-1$
-
     public static IHvDevice create(IDevice device) {
         // default to old mechanism until the new one is fully tested
-        if (sHvProtoEnvVar == null ||
-                !"ddm".equalsIgnoreCase(sHvProtoEnvVar)) { //$NON-NLS-1$
+        if (!HierarchyViewerDirector.isUsingDdmProtocol()) {
             return new ViewServerDevice(device);
         }