filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix X-Mms-Transaction-ID of M-Acknowledge.ind" am: aa5bde8dbe am: 183d4d6c24

Browse Source 
am: a84f2dbad6

Change-Id: I7b92abebb7cdb4342404d7a5d1276ea5d701db99
This commit is contained in:
Taesu Lee
2019-06-11 17:38:30 -07:00
committed by android-build-merger
parent ceaade33fd a84f2dbad6
commit 87e7583d08
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/android/messaging/sms/MmsUtils.java
View File

@@ -1915,7 +1915,7 @@ public class MmsUtils {
final String transactionId, final String contentLocation, final String transactionId, final String contentLocation,
final boolean autoDownload, final long receivedTimestampInSeconds, final boolean autoDownload, final long receivedTimestampInSeconds,
final RetrieveConf retrieveConf) { final RetrieveConf retrieveConf) {
final byte[] transactionIdBytes = stringToBytes(transactionId, "UTF-8"); final byte[] notificationTransactionId = stringToBytes(transactionId, "UTF-8");
Uri messageUri = null; Uri messageUri = null;
int status = MMS_REQUEST_MANUAL_RETRY; int status = MMS_REQUEST_MANUAL_RETRY;
int retrieveStatus = PDU_HEADER_VALUE_UNDEFINED; int retrieveStatus = PDU_HEADER_VALUE_UNDEFINED;
@@ -1940,10 +1940,15 @@ public class MmsUtils {
if (status == MMS_REQUEST_SUCCEEDED) { if (status == MMS_REQUEST_SUCCEEDED) {
// Send response of the notification // Send response of the notification
if (autoDownload) { if (autoDownload) {
sendNotifyResponseForMmsDownload(context, subId, transactionIdBytes, sendNotifyResponseForMmsDownload(
contentLocation, PduHeaders.STATUS_RETRIEVED); context,
subId,
notificationTransactionId,
contentLocation,
PduHeaders.STATUS_RETRIEVED);
} else { } else {
sendAcknowledgeForMmsDownload(context, subId, transactionIdBytes, contentLocation); sendAcknowledgeForMmsDownload(
context, subId, retrieveConf.getTransactionId(), contentLocation);
} }
// Insert downloaded message into telephony // Insert downloaded message into telephony
@@ -1954,8 +1959,12 @@ public class MmsUtils {
// For a retry do nothing // For a retry do nothing
} else if (status == MMS_REQUEST_MANUAL_RETRY && autoDownload) { } else if (status == MMS_REQUEST_MANUAL_RETRY && autoDownload) {
// Failure from autodownload - just treat like manual download // Failure from autodownload - just treat like manual download
sendNotifyResponseForMmsDownload(context, subId, transactionIdBytes, sendNotifyResponseForMmsDownload(
contentLocation, PduHeaders.STATUS_DEFERRED); context,
subId,
notificationTransactionId,
contentLocation,
PduHeaders.STATUS_DEFERRED);
} }
return new StatusPlusUri(status, retrieveStatus, messageUri); return new StatusPlusUri(status, retrieveStatus, messageUri);
} }