commit e61c64a0455e6073bb4ea35631a2404ef693840f
author Daniel Lehmann <lehmannd@google.com> Wed Mar 30 17:55:41 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 30 17:55:41 2011 -0700
tree 065dcee1995aaee6ed5081042a7b11331c8416fd
parent fd89c04d5ff26125d5c00ab6c25db3a2844e73a5
parent 0a8f9e9ac4b56ac3a790bf0c5fd2419611d98cc6

am 0a8f9e9a: am a10775d6: Don\'t save the contact if the user accepts an edit-suggestion

* commit '0a8f9e9ac4b56ac3a790bf0c5fd2419611d98cc6':
  Don't save the contact if the user accepts an edit-suggestion

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 97203bb..ae6788b 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -166,8 +166,10 @@
         public static final int SAVING = 2;
 
         /**
-         * Prevents any more savings (this is used if Save/Close or Revert was
-         * executed by the user)
+         * Prevents any more saves. This is used if in the following cases:
+         * - After Save/Close
+         * - After Revert
+         * - After the user has accepted an edit suggestion
          */
         public static final int CLOSING = 3;
 
@@ -1314,6 +1316,8 @@
      */
     protected void doEditSuggestedContact(Uri contactUri) {
         if (mListener != null) {
+            // make sure we don't save this contact when closing down
+            mStatus = Status.CLOSING;
             mListener.onEditOtherContactRequested(
                     contactUri, mState.get(0).getContentValues());
         }