commit 261063609aa80010baad4dffe591f2f28b8a0f67
author Jean-Baptiste Queru <jbq@google.com> Tue Jun 12 14:54:04 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Tue Jun 12 14:54:04 2012 -0700
tree c5919881db093d01e57b2d8f560024dbbdb9eb07
parent 3921c68a200bb91e12f79182ded8a5546e26b7fe
parent 48bc77589541e6b7fc1c70b26b380a03d6b67506

Merge "Check the parent for null in deleteEditor"

src/com/android/contacts/editor/LabeledEditorView.java

diff --git a/src/com/android/contacts/editor/LabeledEditorView.java b/src/com/android/contacts/editor/LabeledEditorView.java
index 2a1ec5e..2a97f4c 100644
--- a/src/com/android/contacts/editor/LabeledEditorView.java
+++ b/src/com/android/contacts/editor/LabeledEditorView.java
@@ -177,7 +177,10 @@
         mEntry.markDeleted();
 
         // Remove the view
-        ((ViewGroup) getParent()).removeView(LabeledEditorView.this);
+        final ViewGroup parent = (ViewGroup)getParent();
+        if (parent != null) {
+            parent.removeView(LabeledEditorView.this);
+        }
     }
 
     public boolean isReadOnly() {