diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-30 16:06:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-30 16:06:58 -0700 |
| commit | 60842f0275c93185ef03fc6dbc46a82b7eb67fa0 (patch) | |
| tree | 2ec271d5681c4766958d98d14ea535ebf91e9b4f /tools | |
| parent | 0146e94a4c835d6109ec4fa5ac6d3e568daa69e6 (diff) | |
| parent | 5281b823a046b6eb40f12aeb805462f7d58fdebe (diff) | |
| download | android_development-60842f0275c93185ef03fc6dbc46a82b7eb67fa0.tar.gz android_development-60842f0275c93185ef03fc6dbc46a82b7eb67fa0.tar.bz2 android_development-60842f0275c93185ef03fc6dbc46a82b7eb67fa0.zip | |
am 5281b823: Merge change 9208 into donut
Merge commit '5281b823a046b6eb40f12aeb805462f7d58fdebe'
* commit '5281b823a046b6eb40f12aeb805462f7d58fdebe':
Support packages with no license.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java index c940e0dac..94f68fb10 100755 --- a/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java +++ b/tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java @@ -293,8 +293,14 @@ final class UpdateChooserDialog extends Dialog { // Automatically accept those with an empty license
for (Archive a : mNewToOldArchiveMap.keySet()) {
- String license = a.getParentPackage().getLicense().trim();
- if (license.length() == 0) {
+
+ String license = a.getParentPackage().getLicense();
+ if (license != null) {
+ license = license.trim();
+ if (license.length() == 0) {
+ mAccepted.add(a);
+ }
+ } else {
mAccepted.add(a);
}
}
@@ -453,8 +459,11 @@ final class UpdateChooserDialog extends Dialog { sb.append("\n*** Archive Description:\n");
sb.append(a.getLongDescription()).append("\n");
- sb.append("\n*** Package License:\n");
- sb.append(a.getParentPackage().getLicense()).append("\n");
+ String license = a.getParentPackage().getLicense();
+ if (license != null) {
+ sb.append("\n*** Package License:\n");
+ sb.append(license).append("\n");
+ }
mPackageText.setText(sb.toString());
}
|