SDK: fix missing \n in 'android create avd'. Do not merge.

SDK Bug: 20430

(cherry picked from commit c649a334d7bc656ea3c00cd9d3d102c88fbf8f80)

Change-Id: I8b4370b0d4ec4b96e9b65c214a9e06506b615a41

diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index 4e5c0fb..139a4e4 100644 (file)
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -143,6 +143,9 @@ public class Main {
 
             public void printf(String msgFormat, Object... args) {
                 System.out.printf(msgFormat, args);
+                if (!msgFormat.endsWith("\n")) {
+                    System.out.printf("\n");
+                }
             }
         };
     }

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/ISdkLog.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/ISdkLog.java
index ec22177..b1c1f35 100644 (file)
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/ISdkLog.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/ISdkLog.java
@@ -71,7 +71,8 @@ public interface ISdkLog {
     void error(Throwable t, String errorFormat, Object... args);
 
     /**
-     * Prints a message as-is on stdout.
+     * Prints a message on stdout.
+     * IF the message does not end with \n, a carriage return will be inserted.
      * <p/>
      * Implementation can omit printing such messages when not in verbose mode.
      * No prefix is used, the message is printed as-is after formatting.