BUG 1922588: SDK Updater, Needs better license display

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java

@@ -196,9 +196,9 @@ public class AddonPackage extends Package {
     /** Returns a long description for an {@link IDescription}. */
     @Override
     public String getLongDescription() {
-        return String.format("%1$s.\n%2$s",
+        return String.format("%1$s,\nRevision %2$d.",
                 getShortDescription(),
-                super.getLongDescription());
+                getRevision());
     }
 
     /**

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DocPackage.java

@@ -113,9 +113,9 @@ public class DocPackage extends Package {
     /** Returns a long description for an {@link IDescription}. */
     @Override
     public String getLongDescription() {
-        return String.format("%1$s.\n%2$s",
+        return String.format("%1$s,\nRevision %2$d.",
                 getShortDescription(),
-                super.getLongDescription());
+                getRevision());
     }
 
     /**

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java

@@ -192,8 +192,7 @@ public class ExtraPackage extends Package {
             s += String.format(" (min tools rev.: %1$d)", mMinToolsRevision);
         }
 
-        s += ".\n";
-        s += super.getLongDescription();
+        s += ".";
 
         return s;
     }

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/LocalSdkParser.java

@@ -44,7 +44,11 @@ public class LocalSdkParser {
     }
 
     /**
-     * Returns the packages found by the last call to {@link #parseSdk(String, SdkManager, ISdkLog)}.
+     * Returns the packages found by the last call to
+     * {@link #parseSdk(String, SdkManager, ISdkLog)}.
+     * <p/>
+     * This returns initially returns null.
+     * Once the parseSdk() method has been called, this returns a possibly empty but non-null array.
      */
     public Package[] getPackages() {
         return mPackages;

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java

@@ -336,8 +336,11 @@ public abstract class Package implements IDescription {
         if (s != null) {
             sb.append(s);
         }
+        if (sb.length() > 0) {
+            sb.append("\n");
+        }
 
-        sb.append(String.format("\nRevision %1$d", getRevision()));
+        sb.append(String.format("Revision %1$d", getRevision()));
 
         s = getDescUrl();
         if (s != null && s.length() > 0) {

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java

@@ -160,9 +160,7 @@ public class PlatformPackage extends Package {
     /** Returns a long description for an {@link IDescription}. */
     @Override
     public String getLongDescription() {
-        return String.format("%1$s.\n%2$s",
-                getShortDescription(),
-                super.getLongDescription());
+        return getShortDescription() + ".";
     }
 
     /**

tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ToolPackage.java

@@ -76,9 +76,7 @@ public class ToolPackage extends Package {
     /** Returns a long description for an {@link IDescription}. */
     @Override
     public String getLongDescription() {
-        return String.format("Android SDK Tools, revision %1$d.\n%2$s",
-                getRevision(),
-                super.getLongDescription());
+        return getShortDescription() + ".";
     }
 
     /**