diff options
| author | Raphael Moll <ralf@android.com> | 2014-10-09 14:38:44 -0700 |
|---|---|---|
| committer | Raphaël Moll <ralf@android.com> | 2014-10-10 16:31:33 +0000 |
| commit | d27e2f3b44dd600c14c4cddb70d61e8df6972cea (patch) | |
| tree | a78a88bf287da8c3c37fe5af9b95dabea8a3527e /sdkmanager | |
| parent | d2db44dab3c52666c1ce5759624dda4a8d995216 (diff) | |
| download | platform_tools_swt-d27e2f3b44dd600c14c4cddb70d61e8df6972cea.tar.gz platform_tools_swt-d27e2f3b44dd600c14c4cddb70d61e8df6972cea.tar.bz2 platform_tools_swt-d27e2f3b44dd600c14c4cddb70d61e8df6972cea.zip | |
AVD Manager: no longer provide addon's base target sys-img.
When an add-on did not provide any system image, the AVD
Manager behavior was to automatically provide the parent
platform's system image instead. The new behavior is to
not provide any system image and consequently the user
cannot create an AVD using such an add-on.
Change-Id: Id5e27c3e7c6d57bccba6cb318e1f318f4b5c356e
(cherry picked from commit 222fa2d5b0f59baef96360affabc84656accb7c6)
Diffstat (limited to 'sdkmanager')
| -rwxr-xr-x | sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdCreationPresenter.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdCreationPresenter.java b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdCreationPresenter.java index 81948fa..4f5331b 100755 --- a/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdCreationPresenter.java +++ b/sdkmanager/sdkuilib/src/main/java/com/android/sdkuilib/internal/widgets/AvdCreationPresenter.java @@ -1248,9 +1248,15 @@ class AvdCreationPresenter { ISystemImage[] images = target.getSystemImages(); if ((images == null || images.length == 0) && !target.isPlatform()) { - // If an add-on does not provide any system images, use the ones - // from the parent. - images = target.getParent().getSystemImages(); + // This is an add-on and it does not provide any system image. + + // Before LMP / Tools 23.0.4, the behavior was to provide the + // parent (platform) system-image using this code: + // + // images = target.getParent().getSystemImages(); + // + // After tools 23.0.4, the behavior is to NOT provide the + // platform system-image for the add-on. } if (images != null) { |