am c7636b8a: Add support to suppressing undo in Email

* commit 'c7636b8a47b39a482414cf7a9695846956add963':
  Add support to suppressing undo in Email
This commit is contained in:
Paul Westbrook 2012-11-05 13:40:31 -08:00 committed by Android Git Automerger
commit 266c56c035

View File

@ -4080,12 +4080,16 @@ outer:
if (undoValues == null || undoValues.size() == 0) { if (undoValues == null || undoValues.size() == 0) {
return -1; return -1;
} }
ContentProviderOperation op = final Boolean suppressUndo =
ContentProviderOperation.newUpdate(convertToEmailProviderUri( values.getAsBoolean(UIProvider.ConversationOperations.Parameters.SUPPRESS_UNDO);
uri, ourBaseUri, false)) if (suppressUndo == null || !suppressUndo.booleanValue()) {
.withValues(undoValues) final ContentProviderOperation op =
.build(); ContentProviderOperation.newUpdate(convertToEmailProviderUri(
addToSequence(uri, op); uri, ourBaseUri, false))
.withValues(undoValues)
.build();
addToSequence(uri, op);
}
return update(ourUri, ourValues, null, null); return update(ourUri, ourValues, null, null);
} }