Fix HierarchyViewer2 to run on MacOS X correctly.

This also fix the issue with the app never closing correctly
(throwing an exception).

Also updated the launcher script to match the new ones we use in
the other Java based tools.

Change-Id: I851f0732a78c6e6c072728f05e611f01eee8fc19

1 files changed, 1 insertions, 8 deletions

diff --git a/ddms/app/src/com/android/ddms/Main.java b/ddms/app/src/com/android/ddms/Main.java
index 050519f..cd01fc9 100644
--- a/ddms/app/src/com/android/ddms/Main.java
+++ b/ddms/app/src/com/android/ddms/Main.java
@@ -25,8 +25,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.Properties;
@@ -49,12 +47,7 @@ public class Main {
     private static class UncaughtHandler implements Thread.UncaughtExceptionHandler {
         public void uncaughtException(Thread t, Throwable e) {
             Log.e("ddms", "shutting down due to uncaught exception");
-
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw);
-            e.printStackTrace(pw);
-            Log.e("ddms", sw.toString());
-
+            Log.e("ddms", e);
             System.exit(1);
         }
     }