commit 2aa09b9965fd22c4dd5536d0f576ac351a8eb00d
author Frank Sposaro <sposaro@google.com> Wed Jun 29 14:54:51 2011 -0700
committer Frank Sposaro <sposaro@google.com> Wed Jun 29 14:54:51 2011 -0700
tree ebc21aef2273bf6aa5ecf345b9418433d0d3a281
parent 7df60f745472e318961ad657948cb0809e9e4327

Fixed NPE Bug for joining Contacts on Tablet.

Bug: 4355323
Change-Id: Icb4802e0d2b67dc118818d98ea5e06d95dde3d25

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 ba2794d..91792df 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -272,7 +272,9 @@
 
         // If anything was left unsaved, save it now but keep the editor open.
         if (!getActivity().isChangingConfigurations() && mStatus == Status.EDITING) {
-            save(SaveMode.RELOAD);
+            if (mStatus != SaveMode.JOIN) {
+                save(SaveMode.RELOAD);
+            }
         }
     }