commit 8feaebbd112e1f6006882c111da00ad1f1edefbc
author Makoto Onuki <omakoto@google.com> Fri Aug 12 16:12:52 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 12 16:12:52 2011 -0700
tree 818cecf9fbafc31b63becbb11e9a6db1ea83d3d8
parent 47d8b4ae4e6f92f0a6c603f724e3ba939fd04a60
parent 02a54ebd3185948e2c1c0f39b7718cb9abaea934

Merge "Prevent monkey crash with aggregation suggestion popup"

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

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 3869c54..2725d1f 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1340,6 +1340,9 @@
 
         final RawContactEditorView rawContactView =
                 (RawContactEditorView)getRawContactEditorView(mAggregationSuggestionsRawContactId);
+        if (rawContactView == null) {
+            return; // Raw contact deleted?
+        }
         final View anchorView = rawContactView.findViewById(R.id.anchor_view);
         mAggregationSuggestionPopup = new ListPopupWindow(mContext, null);
         mAggregationSuggestionPopup.setAnchorView(anchorView);