commit e813f5e56ddc6395c5e08e9245e2c5ad41e91724
author Daniel Lehmann <lehmannd@google.com> Wed Aug 22 18:27:21 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 22 19:00:16 2012 -0700
tree 51384e969d74266b71c55a5090d3a1bbd1832acc
parent 3d4bed1ed0ebf8df211bb03cc89d1327dd492aef

Guard JOIN in case the state machine gets into an erroneous state

Bug:7013287
Change-Id: Id4da1f02b00efcc02fe3ad6c277189ad96fcb67f

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 5ee6ff9..1f4cb45 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1149,7 +1149,7 @@
             case SaveMode.JOIN:
                 if (saveSucceeded && contactLookupUri != null) {
                     // If it was a JOIN, we are now ready to bring up the join activity.
-                    if (saveMode == SaveMode.JOIN) {
+                    if (saveMode == SaveMode.JOIN && hasValidState()) {
                         showJoinAggregateActivity(contactLookupUri);
                     }