Add logging in ddms.

Change-Id: I42508186ea339de1d97f0de2e801e6152311881a

2 files changed, 18 insertions, 12 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java
index 8900366..02ca3b0 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/src/com/android/ide/eclipse/ddms/DdmsPlugin.java
@@ -27,10 +27,6 @@ import com.android.ddmlib.Log.LogLevel;
 import com.android.ddmuilib.DdmUiPreferences;
 import com.android.ddmuilib.StackTracePanel;
 import com.android.ddmuilib.DevicePanel.IUiSelectionListener;
-import com.android.ddmuilib.logcat.ILogCatMessageEventListener;
-import com.android.ddmuilib.logcat.LogCatMessage;
-import com.android.ddmuilib.logcat.LogCatReceiver;
-import com.android.ddmuilib.logcat.LogCatReceiverFactory;
 import com.android.ide.eclipse.ddms.i18n.Messages;
 import com.android.ide.eclipse.ddms.preferences.PreferenceInitializer;
 
@@ -62,7 +58,6 @@ import org.osgi.framework.BundleContext;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.List;
 
 /**
  * The activator class controls the plug-in life cycle
@@ -503,8 +498,14 @@ public final class DdmsPlugin extends AbstractUIPlugin implements IDeviceChangeL
                     @Override
                     public void run() {
                         // create and start the bridge
-                        AndroidDebugBridge.createBridge(sAdbLocation,
-                                false /* forceNewBridge */);
+                        try {
+                            AndroidDebugBridge.createBridge(sAdbLocation,
+                                    false /* forceNewBridge */);
+                        } catch (Throwable t) {
+                            Status status = new Status(IStatus.ERROR, PLUGIN_ID,
+                                    "Failed to create AndroidDebugBridge", t);
+                            getDefault().getLog().log(status);
+                        }
                     }
                 }.start();
             }
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java
index b345baf..994d4b9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java
@@ -1010,7 +1010,8 @@ public final class DebuggerMessage {
         return builder;
       }
 
-      protected com.android.ide.eclipse.gldebugger.DebuggerMessage.Message internalGetResult() {
+      @Override
+    protected com.android.ide.eclipse.gldebugger.DebuggerMessage.Message internalGetResult() {
         return result;
       }
 
@@ -1023,11 +1024,13 @@ public final class DebuggerMessage {
         return this;
       }
 
-      public Builder clone() {
+      @Override
+    public Builder clone() {
         return create().mergeFrom(result);
       }
 
-      public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message getDefaultInstanceForType() {
+      @Override
+    public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message getDefaultInstanceForType() {
         return com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.getDefaultInstance();
       }
 
@@ -1060,7 +1063,8 @@ public final class DebuggerMessage {
         return returnMe;
       }
 
-      public Builder mergeFrom(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message other) {
+      @Override
+    public Builder mergeFrom(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message other) {
         if (other == com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.getDefaultInstance()) return this;
         if (other.hasContextId()) {
           setContextId(other.getContextId());
@@ -1134,7 +1138,8 @@ public final class DebuggerMessage {
         return this;
       }
 
-      public Builder mergeFrom(
+      @Override
+    public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws java.io.IOException {