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

Merge "Remove dead code" am: 6287290cea am: 653f908e22 am: 13d6b8a605

Browse Source 
Change-Id: I6695b7ab982d019d5ceeaee29e639be842d5b78f
This commit is contained in:
Treehugger Robot
2020-05-25 21:36:55 +00:00
committed by Automerger Merge Worker
parent 395876eb17 13d6b8a605
commit 7543ded553
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/sms/MmsUtils.java
+4 -13
View File
@@ -1925,10 +1925,9 @@ public class MmsUtils {
final long expiry, final RetrieveConf retrieveConf) { final long expiry, final RetrieveConf retrieveConf) {
final byte[] notificationTransactionId = stringToBytes(transactionId, "UTF-8"); final byte[] notificationTransactionId = stringToBytes(transactionId, "UTF-8");
Uri messageUri = null; Uri messageUri = null;
int status = MMS_REQUEST_MANUAL_RETRY; final int status;
int retrieveStatus = PDU_HEADER_VALUE_UNDEFINED; final int retrieveStatus = retrieveConf.getRetrieveStatus();
retrieveStatus = retrieveConf.getRetrieveStatus();
if (retrieveStatus == PduHeaders.RETRIEVE_STATUS_OK) { if (retrieveStatus == PduHeaders.RETRIEVE_STATUS_OK) {
status = MMS_REQUEST_SUCCEEDED; status = MMS_REQUEST_SUCCEEDED;
} else if (retrieveStatus >= PduHeaders.RETRIEVE_STATUS_ERROR_TRANSIENT_FAILURE && } else if (retrieveStatus >= PduHeaders.RETRIEVE_STATUS_ERROR_TRANSIENT_FAILURE &&
@@ -1963,17 +1962,9 @@ public class MmsUtils {
final Uri inboxUri = MmsUtils.insertReceivedMmsMessage(context, retrieveConf, subId, final Uri inboxUri = MmsUtils.insertReceivedMmsMessage(context, retrieveConf, subId,
subPhoneNumber, receivedTimestampInSeconds, expiry, transactionId); subPhoneNumber, receivedTimestampInSeconds, expiry, transactionId);
messageUri = ContentUris.withAppendedId(Mms.CONTENT_URI, ContentUris.parseId(inboxUri)); messageUri = ContentUris.withAppendedId(Mms.CONTENT_URI, ContentUris.parseId(inboxUri));
} else if (status == MMS_REQUEST_AUTO_RETRY) {
// For a retry do nothing
} else if (status == MMS_REQUEST_MANUAL_RETRY && autoDownload) {
// Failure from autodownload - just treat like manual download
sendNotifyResponseForMmsDownload(
context,
subId,
notificationTransactionId,
contentLocation,
PduHeaders.STATUS_DEFERRED);
} }
// Do nothing for MMS_REQUEST_AUTO_RETRY and MMS_REQUEST_NO_RETRY.
return new StatusPlusUri(status, retrieveStatus, messageUri); return new StatusPlusUri(status, retrieveStatus, messageUri);
} }