SDK Updater: automatically accept packages with no license.

1 files changed, 8 insertions, 2 deletions

diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java
index 19d1e8c..f193554 100755
--- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java
+++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java
@@ -277,13 +277,19 @@ final class UpdateChooserDialog extends Dialog {
     private void postCreate() {

         setWindowImage();

 

+        // Automatically accept those with an empty license

+        for (Archive a : mNewToOldArchiveMap.keySet()) {

+            String license = a.getParentPackage().getLicense().trim();

+            if (license.length() == 0) {

+                mAccepted.add(a);

+            }

+        }

+

         // Fill the list with the replacement packages

         mTableViewPackage.setLabelProvider(new NewArchivesLabelProvider());

         mTableViewPackage.setContentProvider(new NewArchivesContentProvider());

         mTableViewPackage.setInput(mNewToOldArchiveMap);

 

-        // TODO automatically accept those with an empty license

-

         adjustColumnsWidth();

 

         // select first item