diff options
| author | Raphael Moll <ralf@android.com> | 2010-04-28 22:59:31 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-04-28 22:59:31 -0700 |
| commit | b625c26a9eec9b4c3846d82493b9d1495b3a4cb9 (patch) | |
| tree | 51c6143cda374b2a5d59d4aca09312ecb3df350b | |
| parent | 74ab7fbdb2cbe6f9df3ee627a7751b0a3eafbb2a (diff) | |
| parent | bee5dcfbdb8907c2b8157d3b446cadc8c9a1f37f (diff) | |
| download | sdk-b625c26a9eec9b4c3846d82493b9d1495b3a4cb9.zip sdk-b625c26a9eec9b4c3846d82493b9d1495b3a4cb9.tar.gz sdk-b625c26a9eec9b4c3846d82493b9d1495b3a4cb9.tar.bz2 | |
Merge "Fix NPE when opening layout and target is still loading."
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java index c059a41..a250c76 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditor.java @@ -505,7 +505,10 @@ public class LayoutEditor extends AndroidEditor implements IShowEditorInput, IPa IAndroidTarget target = currentSdk.getTarget(project); if (target != null) { AndroidTargetData data = currentSdk.getTargetData(target); - desc = data.getLayoutDescriptors().getBaseViewDescriptor(); + if (data != null) { + // data can be null when the target is still loading + desc = data.getLayoutDescriptors().getBaseViewDescriptor(); + } } } |