diff options
| -rw-r--r-- | telephony/java/android/telephony/SmsMessage.java | 22 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/SmsMessage.java | 6 |
2 files changed, 12 insertions, 16 deletions
diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index 7d4bcb740f61..b705d71c61d9 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -843,20 +843,16 @@ public class SmsMessage { } /** - * GSM: - * For an SMS-STATUS-REPORT message, this returns the status field from - * the status report. This field indicates the status of a previously - * submitted SMS, if requested. See TS 23.040, 9.2.3.15 TP-Status for a - * description of values. - * CDMA: - * For not interfering with status codes from GSM, the value is - * shifted to the bits 31-16. - * The value is composed of an error class (bits 25-24) and a status code (bits 23-16). - * Possible codes are described in C.S0015-B, v2.0, 4.5.21. + * GSM: For an SMS-STATUS-REPORT message, this returns the status field from the status report. + * This field indicates the status of a previously submitted SMS, if requested. + * See TS 23.040, 9.2.3.15 TP-Status for a description of values. + * CDMA: For not interfering with status codes from GSM, the value is shifted to the bits 31-16. + * The value is composed of an error class (bits 25-24) and a status code (bits 23-16). Possible + * codes are described in C.S0015-B, v2.0, 4.5.21. * - * @return 0 indicates the previously sent message was received. - * See TS 23.040, 9.9.2.3.15 and C.S0015-B, v2.0, 4.5.21 - * for a description of other possible values. + * @return 0 for GSM or 2 shifted left by 16 for CDMA indicates the previously sent message was + * received. See TS 23.040, 9.2.3.15 and C.S0015-B, v2.0, 4.5.21 for a description of + * other possible values. */ public int getStatus() { return mWrappedSmsMessage.getStatus(); diff --git a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java index 1bd054b5b26c..9ad8befb394d 100644 --- a/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java +++ b/telephony/java/com/android/internal/telephony/cdma/SmsMessage.java @@ -726,12 +726,12 @@ public class SmsMessage extends SmsMessageBase { // being reported refers to. The MsgStatus subparameter // is primarily useful to indicate error conditions -- a // message without this subparameter is assumed to - // indicate successful delivery (status == 0). - if (! mBearerData.messageStatusSet) { + // indicate successful delivery. + if (!mBearerData.messageStatusSet) { Rlog.d(LOG_TAG, "DELIVERY_ACK message without msgStatus (" + (mUserData == null ? "also missing" : "does have") + " userData)."); - status = 0; + status = (BearerData.ERROR_NONE << 8) | BearerData.STATUS_DELIVERED; } else { status = mBearerData.errorClass << 8; status |= mBearerData.messageStatus; |