am 1d7dff86: am 213fb2bd: am 3e5c8dda: Remove PinnedHeaderListDemoActivity
* commit '1d7dff8693708116bc034f385ee022313006f8ca':
Remove PinnedHeaderListDemoActivity
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
old mode 100644
new mode 100755
index 6178e9d..634e29a
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -334,6 +334,8 @@
serviceIntent.setAction(ContactSaveService.ACTION_SAVE_CONTACT);
serviceIntent.putExtra(EXTRA_CONTACT_STATE, (Parcelable) state);
serviceIntent.putExtra(EXTRA_SAVE_IS_PROFILE, isProfile);
+ serviceIntent.putExtra(EXTRA_SAVE_MODE, saveMode);
+
if (updatedPhotos != null) {
serviceIntent.putExtra(EXTRA_UPDATED_PHOTOS, (Parcelable) updatedPhotos);
}
@@ -365,6 +367,7 @@
return;
}
+ int saveMode = intent.getIntExtra(EXTRA_SAVE_MODE, -1);
// Trim any empty fields, and RawContacts, before persisting
final AccountTypeManager accountTypes = AccountTypeManager.getInstance(this);
RawContactModifier.trimEmpty(state, accountTypes);
@@ -503,7 +506,7 @@
}
// If the save failed, insertedRawContactId will be -1
- if (rawContactId < 0 || !saveUpdatedPhoto(rawContactId, photoUri)) {
+ if (rawContactId < 0 || !saveUpdatedPhoto(rawContactId, photoUri, saveMode)) {
succeeded = false;
}
}
@@ -526,12 +529,12 @@
* Save updated photo for the specified raw-contact.
* @return true for success, false for failure
*/
- private boolean saveUpdatedPhoto(long rawContactId, Uri photoUri) {
+ private boolean saveUpdatedPhoto(long rawContactId, Uri photoUri, int saveMode) {
final Uri outputUri = Uri.withAppendedPath(
ContentUris.withAppendedId(RawContacts.CONTENT_URI, rawContactId),
RawContacts.DisplayPhoto.CONTENT_DIRECTORY);
- return ContactPhotoUtils.savePhotoFromUriToUri(this, photoUri, outputUri, true);
+ return ContactPhotoUtils.savePhotoFromUriToUri(this, photoUri, outputUri, (saveMode == 0));
}
/**