commit 873e048b14647e72fa095e1337ab63377649f44c
author Josh Gargus <jjosh@google.com> Thu May 03 10:52:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 03 10:52:59 2012 -0700
tree f28da8a00f8dd1f4a7d446210509e3baed3e524f
parent cc5b1294abc5633de65084d0da3711ad1bc71938
parent 87270e1b58e669354bb1571ced686421c56deb7a

Merge "Avoid crash when re-saving new contact with photo." into jb-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 5a6a3b6..7d9f510 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1027,8 +1027,11 @@
         Intent intent = ContactSaveService.createSaveContactIntent(getActivity(), mState,
                 SAVE_MODE_EXTRA_KEY, saveMode, isEditingUserProfile(), getActivity().getClass(),
                 ContactEditorActivity.ACTION_SAVE_COMPLETED, mUpdatedPhotos);
-
         getActivity().startService(intent);
+
+        // Don't try to save the same photos twice.
+        mUpdatedPhotos = new Bundle();
+
         return true;
     }