diff options
| author | Raphaël Moll <ralf@android.com> | 2012-04-20 11:00:39 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-04-20 11:00:40 -0700 |
| commit | 622512420652f1622a8d0ca9b64845e2a0288aa9 (patch) | |
| tree | e77b214c93cef00b4daf0622208eb38a12d0bba2 /eclipse | |
| parent | 7a8bb60dd336612fe4ec32648ff4e3773c21a150 (diff) | |
| parent | d61484cb62e1d681bd515376ffb0a7fd86de1d3b (diff) | |
| download | sdk-622512420652f1622a8d0ca9b64845e2a0288aa9.zip sdk-622512420652f1622a8d0ca9b64845e2a0288aa9.tar.gz sdk-622512420652f1622a8d0ca9b64845e2a0288aa9.tar.bz2 | |
Merge "Fix NPE"
Diffstat (limited to 'eclipse')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssist.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssist.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssist.java index 7c4cba8..b7c95b5 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssist.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/AndroidContentAssist.java @@ -462,7 +462,9 @@ public abstract class AndroidContentAssist implements IContentAssistProcessor { choices = currentUiNode.getAttributeDescriptors(); } else { ElementDescriptor parentDesc = getDescriptor(parent); - choices = parentDesc.getAttributes(); + if (parentDesc != null) { + choices = parentDesc.getAttributes(); + } } } return choices; |