Merge "SDK Manager fix display of update revisions."

2 files changed, 3 insertions, 3 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java
index fff45b9..fd8545c 100755
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/packages/AddonPackage.java
@@ -488,7 +488,7 @@ public class AddonPackage extends MajorRevisionPackage
         return String.format("%1$s, Android API %2$s, revision %3$s%4$s",

                 getDisplayName(),

                 mVersion.getApiString(),

-                getRevision(),

+                getRevision().toShortString(),

                 isObsolete() ? " (Obsolete)" : "");

     }

 

@@ -503,7 +503,7 @@ public class AddonPackage extends MajorRevisionPackage
         String s = String.format("%1$s, Android API %2$s, revision %3$s%4$s\nBy %5$s",

                 getDisplayName(),

                 mVersion.getApiString(),

-                getRevision(),

+                getRevision().toShortString(),

                 isObsolete() ? " (Obsolete)" : "",  //$NON-NLS-2$

                 getDisplayVendor());

 

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java
index 109c061..0b6d725 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesPage.java
@@ -1376,7 +1376,7 @@ public class PackagesPage extends UpdaterPage implements ISdkChangeListener {
                         if (update != null) {
                             return String.format(
                                     "Update available: rev. %1$s",
-                                    update.getRevision());
+                                    update.getRevision().toShortString());
                         }
                         return "Installed";