Merge "Fix SMS status handling" am: 4e3db63e41

am: 8f649c7078

Change-Id: I706b8d16949f4193fdbb02c1fa0144b971c22bc4
This commit is contained in:
Taesu Lee
2019-06-11 17:33:16 -07:00
committed by android-build-merger
2 changed files with 30 additions and 6 deletions
@@ -202,11 +202,11 @@ class SyncMessageBatch {
// For a message we sync either
if (isOutgoing) {
// Outgoing message not yet been sent
if (type == Telephony.Sms.MESSAGE_TYPE_FAILED ||
type == Telephony.Sms.MESSAGE_TYPE_OUTBOX ||
type == Telephony.Sms.MESSAGE_TYPE_QUEUED ||
(type == Telephony.Sms.MESSAGE_TYPE_SENT &&
status == Telephony.Sms.STATUS_FAILED)) {
if (type == Telephony.Sms.MESSAGE_TYPE_FAILED
|| type == Telephony.Sms.MESSAGE_TYPE_OUTBOX
|| type == Telephony.Sms.MESSAGE_TYPE_QUEUED
|| (type == Telephony.Sms.MESSAGE_TYPE_SENT
&& status >= Telephony.Sms.STATUS_FAILED)) {
// Not sent counts as failed and available for manual resend
bugleStatus = MessageData.BUGLE_STATUS_OUTGOING_FAILED;
} else if (status == Sms.STATUS_COMPLETE) {