diff options
Diffstat (limited to 'sdkmanager')
| -rwxr-xr-x | sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AdtUpdateDialog.java | 14 |
1 files changed, 12 insertions, 2 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 ca1159d..dce4110 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,8 +309,18 @@ public class AdtUpdateDialog extends SwtBaseDialog { boolean accept(Package pkg) {
if (pkg instanceof ExtraPackage) {
ExtraPackage ep = (ExtraPackage) pkg;
- return ep.getVendor().equals(mVendor) &&
- ep.getPath().equals(mPath);
+ if (ep.getVendor().equals(mVendor)) {
+ // Check actual extra <path> field first
+ if (ep.getPath().equals(mPath)) {
+ return true;
+ }
+ // If not, check whether this is one of the <old-paths> values.
+ for (String oldPath : ep.getOldPaths()) {
+ if (oldPath.equals(mPath)) {
+ return true;
+ }
+ }
+ }
}
return false;
}
|