LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change 9208 into donut

Browse Source 
* changes:
  Support packages with no license.
This commit is contained in:
Android (Google) Code Review
2009-07-30 12:29:27 -07:00
parent f5d51ce49f c74ace1ebd
commit 5281b823a0
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdateChooserDialog.java
View File

@@ -293,8 +293,14 @@ final class UpdateChooserDialog extends Dialog {
// Automatically accept those with an empty license // Automatically accept those with an empty license
for (Archive a : mNewToOldArchiveMap.keySet()) { 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); mAccepted.add(a);
} }
} }
@@ -453,8 +459,11 @@ final class UpdateChooserDialog extends Dialog {
sb.append("\n*** Archive Description:\n"); sb.append("\n*** Archive Description:\n");
sb.append(a.getLongDescription()).append("\n"); sb.append(a.getLongDescription()).append("\n");
sb.append("\n*** Package License:\n"); String license = a.getParentPackage().getLicense();
sb.append(a.getParentPackage().getLicense()).append("\n"); if (license != null) {
sb.append("\n*** Package License:\n");
sb.append(license).append("\n");
}
mPackageText.setText(sb.toString()); mPackageText.setText(sb.toString());
} }