Update error message shown when ddms does not find adb.

Change-Id: I7e949a943694a98faab5aa475808f4f071e1ade4

1 files changed, 60 insertions, 49 deletions

diff --git a/ddms/libs/ddmlib/src/com/android/ddmlib/AndroidDebugBridge.java b/ddms/libs/ddmlib/src/com/android/ddmlib/AndroidDebugBridge.java
index 15eb0dc..5407d7f 100644
--- a/ddms/libs/ddmlib/src/com/android/ddmlib/AndroidDebugBridge.java
+++ b/ddms/libs/ddmlib/src/com/android/ddmlib/AndroidDebugBridge.java
@@ -560,68 +560,79 @@ public final class AndroidDebugBridge {
             return;
         }
 
+        String[] command = new String[2];
+        command[0] = mAdbOsLocation;
+        command[1] = "version"; //$NON-NLS-1$
+        Log.d(DDMS, String.format("Checking '%1$s version'", mAdbOsLocation));
+        Process process = null;
         try {
-            String[] command = new String[2];
-            command[0] = mAdbOsLocation;
-            command[1] = "version"; //$NON-NLS-1$
-            Log.d(DDMS, String.format("Checking '%1$s version'", mAdbOsLocation)); //$NON-NLS-1$
-            Process process = Runtime.getRuntime().exec(command);
+            process = Runtime.getRuntime().exec(command);
+        } catch (IOException e) {
+            boolean exists = new File(mAdbOsLocation).exists();
+            String msg;
+            if (exists) {
+                msg = String.format(
+                        "Unexpected exception '%1$s' while attempting to get adb version from '%2$s'",
+                        e.getMessage(), mAdbOsLocation);
+            } else {
+                msg = "Unable to locate adb.\n" +
+                      "Please use SDK Manager and check if Android SDK platform-tools are installed.";
+            }
+            Log.logAndDisplay(LogLevel.ERROR, ADB, msg);
+            return;
+        }
 
-            ArrayList<String> errorOutput = new ArrayList<String>();
-            ArrayList<String> stdOutput = new ArrayList<String>();
-            int status = grabProcessOutput(process, errorOutput, stdOutput,
+        ArrayList<String> errorOutput = new ArrayList<String>();
+        ArrayList<String> stdOutput = new ArrayList<String>();
+        int status;
+        try {
+            status = grabProcessOutput(process, errorOutput, stdOutput,
                     true /* waitForReaders */);
+        } catch (InterruptedException e) {
+            return;
+        }
 
-            if (status != 0) {
-                StringBuilder builder = new StringBuilder("'adb version' failed!"); //$NON-NLS-1$
-                for (String error : errorOutput) {
-                    builder.append('\n');
-                    builder.append(error);
-                }
-                Log.logAndDisplay(LogLevel.ERROR, ADB, builder.toString());
+        if (status != 0) {
+            StringBuilder builder = new StringBuilder("'adb version' failed!"); //$NON-NLS-1$
+            for (String error : errorOutput) {
+                builder.append('\n');
+                builder.append(error);
             }
+            Log.logAndDisplay(LogLevel.ERROR, ADB, builder.toString());
+        }
 
-            // check both stdout and stderr
-            boolean versionFound = false;
-            for (String line : stdOutput) {
+        // check both stdout and stderr
+        boolean versionFound = false;
+        for (String line : stdOutput) {
+            versionFound = scanVersionLine(line);
+            if (versionFound) {
+                break;
+            }
+        }
+        if (!versionFound) {
+            for (String line : errorOutput) {
                 versionFound = scanVersionLine(line);
                 if (versionFound) {
                     break;
                 }
             }
-            if (!versionFound) {
-                for (String line : errorOutput) {
-                    versionFound = scanVersionLine(line);
-                    if (versionFound) {
-                        break;
-                    }
-                }
-            }
+        }
 
-            if (!versionFound) {
-                // if we get here, we failed to parse the output.
-                StringBuilder builder = new StringBuilder(
-                        "Failed to parse the output of 'adb version':\n"); //$NON-NLS-1$
-                builder.append("Standard Output was:\n"); //$NON-NLS-1$
-                for (String line : stdOutput) {
-                    builder.append(line);
-                    builder.append('\n');
-                }
-                builder.append("\nError Output was:\n"); //$NON-NLS-1$
-                for (String line : errorOutput) {
-                    builder.append(line);
-                    builder.append('\n');
-                }
-                Log.logAndDisplay(LogLevel.ERROR, ADB, builder.toString());
+        if (!versionFound) {
+            // if we get here, we failed to parse the output.
+            StringBuilder builder = new StringBuilder(
+                    "Failed to parse the output of 'adb version':\n"); //$NON-NLS-1$
+            builder.append("Standard Output was:\n"); //$NON-NLS-1$
+            for (String line : stdOutput) {
+                builder.append(line);
+                builder.append('\n');
             }
-        } catch (IOException e) {
-            Log.logAndDisplay(LogLevel.ERROR, ADB,
-                    "Failed to get the adb version: " + e.getMessage()   //$NON-NLS-1$
-                    + " from '" + mAdbOsLocation + "' - exists="         //$NON-NLS-1$
-                            + (new File(mAdbOsLocation).exists()));
-        } catch (InterruptedException e) {
-        } finally {
-
+            builder.append("\nError Output was:\n"); //$NON-NLS-1$
+            for (String line : errorOutput) {
+                builder.append(line);
+                builder.append('\n');
+            }
+            Log.logAndDisplay(LogLevel.ERROR, ADB, builder.toString());
         }
     }