commit cd1b9a29458d30ec74cf94dc9945cbdb6186a68e
author Dmitri Plotnikov <dplotnikov@google.com> Tue Feb 15 15:22:27 2011 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Tue Feb 15 15:22:27 2011 -0800
tree 32e59951bdb8dc6d94ed4e7947d517ec7a2dd3ec
parent e8b87af24c11a3319ac946aeb149eaad1d3ec14d

Preventing NPE in aggregation suggestion UI

Bug: 3438193
Change-Id: I0a30d99339268e388d310720b52137022a3a44fe

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 6aea62a..e300894 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1345,6 +1345,10 @@
      * contacts), save all changes, and stay in the editor.
      */
     protected void doJoinSuggestedContact(long[] rawContactIds) {
+        if (!hasValidState() || mStatus != Status.EDITING) {
+            return;
+        }
+
         mState.setJoinWithRawContacts(rawContactIds);
         save(SaveMode.RELOAD);
     }