commit 74a052de631f999c498489e8b865a2dcd6223cef
author Daniel Lehmann <lehmannd@google.com> Thu Aug 23 16:16:30 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 23 16:16:30 2012 -0700
tree 71cc3509d9f717b8c87e8c3441b7be565246a361
parent a4e88c594cb6cd2b8a7aa878497f374145cff2e1
parent e813f5e56ddc6395c5e08e9245e2c5ad41e91724

Merge "Guard JOIN in case the state machine gets into an erroneous state" into jb-mr1-dev

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);
                     }