Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74a052de authored by Daniel Lehmann's avatar Daniel Lehmann Committed by Android (Google) Code Review
Browse files

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

parents a4e88c59 e813f5e5

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

+1 −1
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ public class ContactEditorFragment extends Fragment implements 
            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);

                    }