am 3d899bce: am fabb15fa: Merge "Add fallbacks if sentDate is not set" into jb-ub-mail-ur10

* commit '3d899bcebe2f7e7de38f1ebee7e2c2cb7eece744':
  Add fallbacks if sentDate is not set
This commit is contained in:
Yu Ping Hu 2013-11-13 17:28:43 -08:00 committed by Android Git Automerger
commit 5dda0438c9
2 changed files with 5 additions and 0 deletions

View File

@ -988,6 +988,8 @@ public abstract class EmailContent {
if (doSave) {
return super.save(context);
} else {
// FLAG: Should we be doing this? In the base class, if someone calls "save" on
// an EmailContent that is already saved, it throws an exception.
// Call update, rather than super.update in case we ever override it
if (update(context, toContentValues()) == 1) {
return getUri();

View File

@ -92,6 +92,9 @@ public class LegacyConversions {
}
if (sentDate != null) {
localMessage.mTimeStamp = sentDate.getTime();
} else if (internalDate != null) {
LogUtils.w(Logging.LOG_TAG, "No sentDate, falling back to internalDate");
localMessage.mTimeStamp = internalDate.getTime();
}
if (subject != null) {
localMessage.mSubject = subject;