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

Fix SMS status handling

Browse Source 
Simple matching up CDMA status with GSM TP-Status for common handling.
And fix bugleStatusForSMS() for all the permanent error cases.

Note: Need to check SC operation for ERROR_TEMPORARY.
Test: Manual

Change-Id: Ic8136d273dc0c25a4f0690f951d4d8aca20579ff
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
This commit is contained in:
Taesu Lee
2019-03-15 16:22:48 +09:00
parent bada9f9b46
commit 4b1c6eb2c9
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/receiver/SendStatusReceiver.java
+25 -1
View File
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.provider.Telephony.Sms;
import android.telephony.SmsMessage;
import com.android.messaging.datamodel.action.ProcessDeliveryReportAction;
@@ -81,9 +82,32 @@ public class SendStatusReceiver extends BroadcastReceiver {
LogUtil.e(LogUtil.BUGLE_TAG, "SendStatusReceiver: empty report message");
return;
}
int status = 0;
int status = Sms.STATUS_COMPLETE;
try {
final String format = intent.getStringExtra("format");
status = smsMessage.getStatus();
// Simple matching up CDMA status with GSM status.
if (SmsMessage.FORMAT_3GPP2.equals(format)) {
final int errorClass = (status >> 24) & 0x03;
final int statusCode = (status >> 16) & 0x3f;
switch (errorClass) {
case 0: /*ERROR_NONE*/
if (statusCode == 0x02 /*STATUS_DELIVERED*/) {
status = Sms.STATUS_COMPLETE;
} else status = Sms.STATUS_PENDING;
break;
case 2: /*ERROR_TEMPORARY*/
// TODO: Need to check whether SC still trying to deliver the SMS to
// destination and will send the report again?
status = Sms.STATUS_PENDING;
break;
case 3: /*ERROR_PERMANENT*/
status = Sms.STATUS_FAILED;
break;
default:
status = Sms.STATUS_PENDING;
}
}
} catch (final NullPointerException e) {
// Sometimes, SmsMessage.mWrappedSmsMessage is null causing NPE when we access
// the methods on it although the SmsMessage itself is not null.