diff options
| author | The Android Open-Source Project <initial-contribution@android.com> | 2011-06-28 18:24:40 -0700 |
|---|---|---|
| committer | The Android Open-Source Project <initial-contribution@android.com> | 2011-06-28 18:24:40 -0700 |
| commit | efbe905a4f6a7efe6239337b5f82157383b3f40a (patch) | |
| tree | d4478c5eab205632583dccee4745e258f5c58579 /ide_common/src/com/android/ide/common | |
| parent | 6d37a25ee262ff5c52f16e3b5a43cb274d1b8f0c (diff) | |
| parent | 488e22bba4977d9617675925e08930476960c11c (diff) | |
| download | sdk-efbe905a4f6a7efe6239337b5f82157383b3f40a.zip sdk-efbe905a4f6a7efe6239337b5f82157383b3f40a.tar.gz sdk-efbe905a4f6a7efe6239337b5f82157383b3f40a.tar.bz2 | |
merge from tools_r12
Change-Id: I83911d9ee56e5d44045a5ecbd28647a551f8ea79
Diffstat (limited to 'ide_common/src/com/android/ide/common')
| -rw-r--r-- | ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java b/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java index 240c02f..1dab87d 100644 --- a/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java +++ b/ide_common/src/com/android/ide/common/rendering/LayoutLibrary.java @@ -328,8 +328,10 @@ public class LayoutLibrary { // Extended view info was requested but the layoutlib does not support it. // Add it manually. List<ViewInfo> infoList = session.getRootViews(); - for (ViewInfo info : infoList) { - addExtendedViewInfo(info); + if (infoList != null) { + for (ViewInfo info : infoList) { + addExtendedViewInfo(info); + } } } |