SDK Repository: vendor id/display name for extras.

SDK Bug: 21942, part 1 of 2.

Change-Id: Id9c026965b365e57302c56620f4ec8f88573d633

4 files changed, 53 insertions, 38 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java
index dce4110..2311df2 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java
@@ -309,7 +309,7 @@ public class AdtUpdateDialog extends SwtBaseDialog {
             boolean accept(Package pkg) {

                 if (pkg instanceof ExtraPackage) {

                     ExtraPackage ep = (ExtraPackage) pkg;

-                    if (ep.getVendor().equals(mVendor)) {

+                    if (ep.getVendorId().equals(mVendor)) {

                         // Check actual extra <path> field first

                         if (ep.getPath().equals(mPath)) {

                             return true;

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java
index 49395ef..944dffb 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogic.java
@@ -221,8 +221,8 @@ class PackagesDiffLogic {
                 Package p = item.getMainPackage();
                 if (p instanceof ExtraPackage && item.getState() == PkgState.NEW) {
                     ExtraPackage ep = (ExtraPackage) p;
-                    if (ep.getVendor().equals("google") &&          //$NON-NLS-1$
-                            ep.getPath().equals("usb_driver")) {    //$NON-NLS-1$
+                    if (ep.getVendorId().equals("google") &&            //$NON-NLS-1$
+                            ep.getPath().equals("usb_driver")) {        //$NON-NLS-1$
                         item.setChecked(true);
                     }
                 }
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 58d7daa..d3dc7b6 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
@@ -519,7 +519,9 @@ public class PackagesPage extends UpdaterPage
                 value = button.getSelection();
             }
 
-            item.setSelection(value);
+            if (!item.isDisposed()) {
+                item.setSelection(value);
+            }
         }
 
     }
@@ -1564,12 +1566,25 @@ public class PackagesPage extends UpdaterPage
             if (element instanceof IDescription) {
                 String s = ((IDescription) element).getLongDescription();
                 if (element instanceof Package) {
-                    SdkSource src = ((Package) element).getParentSource();
+                    Package p = (Package) element;
+
+                    if (!p.isLocal()) {
+                        // For non-installed item, try to find a download size
+                        for (Archive a : p.getArchives()) {
+                            if (!a.isLocal() && a.isCompatible()) {
+                                s += '\n' + a.getSizeDescription();
+                                break;
+                            }
+                        }
+                    }
+
+                    // Display info about where this package comes/came from
+                    SdkSource src = p.getParentSource();
                     if (src != null) {
                         try {
                             URL url = new URL(src.getUrl());
                             String host = url.getHost();
-                            if (((Package) element).isLocal()) {
+                            if (p.isLocal()) {
                                 s += String.format("\nInstalled from %1$s", host);
                             } else {
                                 s += String.format("\nProvided by %1$s", host);
diff --git a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java
index eafe5ac..85f1ab5 100755
--- a/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java
+++ b/sdkmanager/libs/sdkuilib/tests/com/android/sdkuilib/internal/repository/sdkman2/PackagesDiffLogicTest.java
@@ -326,8 +326,8 @@ public class PackagesDiffLogicTest extends TestCase {
                 "-- <INSTALLED, pkg:Android SDK Tools, revision 10>\n" +
                 "-- <INSTALLED, pkg:Android SDK Platform-tools, revision 3>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=2>\n" +
-                "-- <INSTALLED, pkg:Android USB Driver package, revision 5>\n" +
-                "-- <INSTALLED, pkg:Carrier Custom Rom package, revision 1>\n",
+                "-- <INSTALLED, pkg:Android USB Driver, revision 5>\n" +
+                "-- <INSTALLED, pkg:Carrier Custom Rom, revision 1>\n",
                 getTree(m, true /*displaySortByApi*/));
 
         assertEquals(
@@ -335,8 +335,8 @@ public class PackagesDiffLogicTest extends TestCase {
                 "-- <INSTALLED, pkg:Android SDK Tools, revision 10>\n" +
                 "-- <INSTALLED, pkg:Android SDK Platform-tools, revision 3>\n" +
                 "PkgCategorySource <source=repo2 (example.com), #items=2>\n" +
-                "-- <INSTALLED, pkg:Android USB Driver package, revision 5>\n" +
-                "-- <INSTALLED, pkg:Carrier Custom Rom package, revision 1>\n",
+                "-- <INSTALLED, pkg:Android USB Driver, revision 5>\n" +
+                "-- <INSTALLED, pkg:Carrier Custom Rom, revision 1>\n",
                 getTree(m, false /*displaySortByApi*/));
     }
 
@@ -371,8 +371,8 @@ public class PackagesDiffLogicTest extends TestCase {
                 "-- <INSTALLED, pkg:Android SDK Tools, revision 10>\n" +
                 "-- <INSTALLED, pkg:Android SDK Platform-tools, revision 3>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=2>\n" +
-                "-- <INSTALLED, pkg:Android USB Driver package, revision 4, updated by:Android USB Driver package, revision 5>\n" +
-                "-- <NEW, pkg:Carrier Custom Rom package, revision 1>\n",
+                "-- <INSTALLED, pkg:Android USB Driver, revision 4, updated by:Android USB Driver, revision 5>\n" +
+                "-- <NEW, pkg:Carrier Custom Rom, revision 1>\n",
                 getTree(m, true /*displaySortByApi*/));
 
         // Next update adds platforms and addon, sorted in a category based on their API level
@@ -430,8 +430,8 @@ public class PackagesDiffLogicTest extends TestCase {
                 "-- <INSTALLED, pkg:addon A by vendor 1, Android API 1, revision 5, updated by:addon A by vendor 1, Android API 1, revision 6>\n" +
                 "-- <INSTALLED, pkg:addon D by vendor 1, Android API 1, revision 10, updated by:addon D by vendor 1, Android API 1, revision 13>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=2>\n" +
-                "-- <INSTALLED, pkg:Android USB Driver package, revision 4, updated by:Android USB Driver package, revision 5>\n" +
-                "-- <NEW, pkg:Carrier Custom Rom package, revision 1>\n",
+                "-- <INSTALLED, pkg:Android USB Driver, revision 4, updated by:Android USB Driver, revision 5>\n" +
+                "-- <NEW, pkg:Carrier Custom Rom, revision 1>\n",
                 getTree(m, true /*displaySortByApi*/));
 
         // Reloading the same thing should have no impact except for the update methods
@@ -486,8 +486,8 @@ public class PackagesDiffLogicTest extends TestCase {
                 "-- <INSTALLED, pkg:addon A by vendor 1, Android API 1, revision 5, updated by:addon A by vendor 1, Android API 1, revision 6>\n" +
                 "-- <INSTALLED, pkg:addon D by vendor 1, Android API 1, revision 10, updated by:addon D by vendor 1, Android API 1, revision 13>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=2>\n" +
-                "-- <INSTALLED, pkg:Android USB Driver package, revision 4, updated by:Android USB Driver package, revision 5>\n" +
-                "-- <NEW, pkg:Carrier Custom Rom package, revision 1>\n",
+                "-- <INSTALLED, pkg:Android USB Driver, revision 4, updated by:Android USB Driver, revision 5>\n" +
+                "-- <NEW, pkg:Carrier Custom Rom, revision 1>\n",
                 getTree(m, true /*displaySortByApi*/));
     }
 
@@ -714,8 +714,8 @@ public class PackagesDiffLogicTest extends TestCase {
                 "PkgCategorySource <source=repo1 (1.example.com), #items=4>\n" +
                 "-- <INSTALLED, pkg:Android SDK Tools, revision 10>\n" +
                 "-- <INSTALLED, pkg:Android SDK Platform-tools, revision 3>\n" +
-                "-- <INSTALLED, pkg:Android USB Driver package, revision 4, updated by:Android USB Driver package, revision 5>\n" +
-                "-- <NEW, pkg:Carrier Custom Rom package, revision 1>\n",
+                "-- <INSTALLED, pkg:Android USB Driver, revision 4, updated by:Android USB Driver, revision 5>\n" +
+                "-- <NEW, pkg:Carrier Custom Rom, revision 1>\n",
                 getTree(m, false /*displaySortByApi*/));
 
         // Next update adds platforms and addon, sorted in a category based on their API level
@@ -766,8 +766,8 @@ public class PackagesDiffLogicTest extends TestCase {
                 "-- <INSTALLED, pkg:SDK Platform Android android-3, API 3, revision 6>\n" +
                 "-- <NEW, pkg:SDK Platform Android android-2, API 2, revision 4>\n" +
                 "-- <INSTALLED, pkg:SDK Platform Android android-1, API 1, revision 2>\n" +
-                "-- <INSTALLED, pkg:Android USB Driver package, revision 4, updated by:Android USB Driver package, revision 5>\n" +
-                "-- <NEW, pkg:Carrier Custom Rom package, revision 1>\n" +
+                "-- <INSTALLED, pkg:Android USB Driver, revision 4, updated by:Android USB Driver, revision 5>\n" +
+                "-- <NEW, pkg:Carrier Custom Rom, revision 1>\n" +
                 "PkgCategorySource <source=repo2 (2.example.com), #items=4>\n" +
                 "-- <NEW, pkg:addon B by vendor 2, Android API 2, revision 9>\n" +
                 "-- <NEW, pkg:addon C by vendor 2, Android API 2, revision 9>\n" +
@@ -820,8 +820,8 @@ public class PackagesDiffLogicTest extends TestCase {
                 "-- <INSTALLED, pkg:SDK Platform Android android-3, API 3, revision 6>\n" +
                 "-- <NEW, pkg:SDK Platform Android android-2, API 2, revision 4>\n" +
                 "-- <INSTALLED, pkg:SDK Platform Android android-1, API 1, revision 2>\n" +
-                "-- <INSTALLED, pkg:Android USB Driver package, revision 4, updated by:Android USB Driver package, revision 5>\n" +
-                "-- <NEW, pkg:Carrier Custom Rom package, revision 1>\n" +
+                "-- <INSTALLED, pkg:Android USB Driver, revision 4, updated by:Android USB Driver, revision 5>\n" +
+                "-- <NEW, pkg:Carrier Custom Rom, revision 1>\n" +
                 "PkgCategorySource <source=repo2 (2.example.com), #items=4>\n" +
                 "-- <NEW, pkg:addon B by vendor 2, Android API 2, revision 9>\n" +
                 "-- <NEW, pkg:addon C by vendor 2, Android API 2, revision 9>\n" +
@@ -975,8 +975,8 @@ public class PackagesDiffLogicTest extends TestCase {
                 "-- <NEW, pkg:SDK Platform Android android-1, API 1, revision 2>\n" +
                 "-- <NEW, pkg:addon A by vendor 1, Android API 1, revision 5>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=2>\n" +
-                "-- <NEW, pkg:Carrier Custom Rom package, revision 1>\n" +
-                "-- <NEW, pkg:Google USB Driver package, revision 5>\n",
+                "-- <NEW, pkg:Carrier Custom Rom, revision 1>\n" +
+                "-- <NEW, pkg:Google USB Driver, revision 5>\n",
                 getTree(m, true /*displaySortByApi*/));
         assertEquals(
                 "PkgCategorySource <source=repo1 (1.example.com), #items=7>\n" +
@@ -986,11 +986,11 @@ public class PackagesDiffLogicTest extends TestCase {
                 "-- <NEW, pkg:SDK Platform Android android-1, API 1, revision 2>\n" +
                 "-- < * NEW, pkg:ARM EABI System Image, Android API 2, revision 1>\n" +
                 "-- < * NEW, pkg:Intel x86 Atom System Image, Android API 2, revision 1>\n" +
-                "-- <NEW, pkg:Google USB Driver package, revision 5>\n" +
+                "-- <NEW, pkg:Google USB Driver, revision 5>\n" +
                 "PkgCategorySource <source=repo2 (2.example.com), #items=3>\n" +
                 "-- < * NEW, pkg:addon B by vendor 2, Android API 2, revision 7>\n" +
                 "-- <NEW, pkg:addon A by vendor 1, Android API 1, revision 5>\n" +
-                "-- <NEW, pkg:Carrier Custom Rom package, revision 1>\n",
+                "-- <NEW, pkg:Carrier Custom Rom, revision 1>\n",
                 getTree(m, false /*displaySortByApi*/));
 
         // We don't install the USB driver by default on Mac or Linux, only on Windows
@@ -1005,11 +1005,11 @@ public class PackagesDiffLogicTest extends TestCase {
         assertEquals(
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=0>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=1>\n" +
-                "-- <NEW, pkg:Google USB Driver package, revision 5>\n",
+                "-- <NEW, pkg:Google USB Driver, revision 5>\n",
                 getTree(m, true /*displaySortByApi*/));
         assertEquals(
                 "PkgCategorySource <source=repo1 (1.example.com), #items=1>\n" +
-                "-- <NEW, pkg:Google USB Driver package, revision 5>\n",
+                "-- <NEW, pkg:Google USB Driver, revision 5>\n",
                 getTree(m, false /*displaySortByApi*/));
 
         m.clear();
@@ -1023,11 +1023,11 @@ public class PackagesDiffLogicTest extends TestCase {
         assertEquals(
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=0>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=1>\n" +
-                "-- <NEW, pkg:Google USB Driver package, revision 5>\n",
+                "-- <NEW, pkg:Google USB Driver, revision 5>\n",
                 getTree(m, true /*displaySortByApi*/));
         assertEquals(
                 "PkgCategorySource <source=repo1 (1.example.com), #items=1>\n" +
-                "-- <NEW, pkg:Google USB Driver package, revision 5>\n",
+                "-- <NEW, pkg:Google USB Driver, revision 5>\n",
                 getTree(m, false /*displaySortByApi*/));
 
         m.clear();
@@ -1041,11 +1041,11 @@ public class PackagesDiffLogicTest extends TestCase {
         assertEquals(
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=0>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=1>\n" +
-                "-- < * NEW, pkg:Google USB Driver package, revision 5>\n",
+                "-- < * NEW, pkg:Google USB Driver, revision 5>\n",
                 getTree(m, true /*displaySortByApi*/));
         assertEquals(
                 "PkgCategorySource <source=repo1 (1.example.com), #items=1>\n" +
-                "-- < * NEW, pkg:Google USB Driver package, revision 5>\n",
+                "-- < * NEW, pkg:Google USB Driver, revision 5>\n",
                 getTree(m, false /*displaySortByApi*/));
 
     }
@@ -1254,13 +1254,13 @@ public class PackagesDiffLogicTest extends TestCase {
         assertEquals(
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=0>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=2>\n" +
-                "-- <NEW, pkg:Vendor1 New Path2 package, revision 2>\n" +
-                "-- <INSTALLED, pkg:Vendor1 Old Path1 package, revision 1>\n",
+                "-- <NEW, pkg:Vendor1 New Path2, revision 2>\n" +
+                "-- <INSTALLED, pkg:Vendor1 Old Path1, revision 1>\n",
                 getTree(m, true /*displaySortByApi*/));
         assertEquals(
                 "PkgCategorySource <source=repo1 (example.com), #items=2>\n" +
-                "-- <NEW, pkg:Vendor1 New Path2 package, revision 2>\n" +
-                "-- <INSTALLED, pkg:Vendor1 Old Path1 package, revision 1>\n",
+                "-- <NEW, pkg:Vendor1 New Path2, revision 2>\n" +
+                "-- <INSTALLED, pkg:Vendor1 Old Path1, revision 1>\n",
                 getTree(m, false /*displaySortByApi*/));
 
         // Now, start again, but this time the new package uses the old-path attribute
@@ -1280,11 +1280,11 @@ public class PackagesDiffLogicTest extends TestCase {
         assertEquals(
                 "PkgCategoryApi <API=TOOLS, label=Tools, #items=0>\n" +
                 "PkgCategoryApi <API=EXTRAS, label=Extras, #items=1>\n" +
-                "-- <INSTALLED, pkg:Vendor1 Old Path1 package, revision 1, updated by:Vendor1 New Path2 package, revision 2>\n",
+                "-- <INSTALLED, pkg:Vendor1 Old Path1, revision 1, updated by:Vendor1 New Path2, revision 2>\n",
                 getTree(m, true /*displaySortByApi*/));
         assertEquals(
                 "PkgCategorySource <source=repo1 (example.com), #items=1>\n" +
-                "-- <INSTALLED, pkg:Vendor1 Old Path1 package, revision 1, updated by:Vendor1 New Path2 package, revision 2>\n",
+                "-- <INSTALLED, pkg:Vendor1 Old Path1, revision 1, updated by:Vendor1 New Path2, revision 2>\n",
                 getTree(m, false /*displaySortByApi*/));
     }