aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/com/android/internal/telephony/gsm/SmsMessage.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/java/com/android/internal/telephony/gsm/SmsMessage.java')
-rw-r--r--src/java/com/android/internal/telephony/gsm/SmsMessage.java58
1 files changed, 29 insertions, 29 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/SmsMessage.java b/src/java/com/android/internal/telephony/gsm/SmsMessage.java
index 9421dd757..fd4d8c1d0 100644
--- a/src/java/com/android/internal/telephony/gsm/SmsMessage.java
+++ b/src/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -18,7 +18,7 @@ package com.android.internal.telephony.gsm;
import android.telephony.PhoneNumberUtils;
import android.text.format.Time;
-import android.util.Log;
+import android.telephony.Rlog;
import com.android.internal.telephony.EncodeException;
import com.android.internal.telephony.GsmAlphabet;
@@ -105,7 +105,7 @@ public class SmsMessage extends SmsMessageBase {
msg.parsePdu(pdu);
return msg;
} catch (RuntimeException ex) {
- Log.e(LOG_TAG, "SMS PDU parsing failed: ", ex);
+ Rlog.e(LOG_TAG, "SMS PDU parsing failed: ", ex);
return null;
}
}
@@ -133,7 +133,7 @@ public class SmsMessage extends SmsMessageBase {
msg.parsePdu(IccUtils.hexStringToBytes(lines[1]));
return msg;
} catch (RuntimeException ex) {
- Log.e(LOG_TAG, "SMS PDU parsing failed: ", ex);
+ Rlog.e(LOG_TAG, "SMS PDU parsing failed: ", ex);
return null;
}
}
@@ -145,7 +145,7 @@ public class SmsMessage extends SmsMessageBase {
msg.parsePdu(IccUtils.hexStringToBytes(line));
return msg;
} catch (RuntimeException ex) {
- Log.e(LOG_TAG, "CDS SMS PDU parsing failed: ", ex);
+ Rlog.e(LOG_TAG, "CDS SMS PDU parsing failed: ", ex);
return null;
}
}
@@ -170,7 +170,7 @@ public class SmsMessage extends SmsMessageBase {
// or STORED_UNSENT
// See TS 51.011 10.5.3
if ((data[0] & 1) == 0) {
- Log.w(LOG_TAG,
+ Rlog.w(LOG_TAG,
"SMS parsing failed: Trying to parse a free record");
return null;
} else {
@@ -186,7 +186,7 @@ public class SmsMessage extends SmsMessageBase {
msg.parsePdu(pdu);
return msg;
} catch (RuntimeException ex) {
- Log.e(LOG_TAG, "SMS PDU parsing failed: ", ex);
+ Rlog.e(LOG_TAG, "SMS PDU parsing failed: ", ex);
return null;
}
}
@@ -256,7 +256,7 @@ public class SmsMessage extends SmsMessageBase {
SmsHeader smsHeader = SmsHeader.fromByteArray(header);
if (smsHeader.languageTable != languageTable
|| smsHeader.languageShiftTable != languageShiftTable) {
- Log.w(LOG_TAG, "Updating language table in SMS header: "
+ Rlog.w(LOG_TAG, "Updating language table in SMS header: "
+ smsHeader.languageTable + " -> " + languageTable + ", "
+ smsHeader.languageShiftTable + " -> " + languageShiftTable);
smsHeader.languageTable = languageTable;
@@ -289,7 +289,7 @@ public class SmsMessage extends SmsMessageBase {
try {
userData = encodeUCS2(message, header);
} catch(UnsupportedEncodingException uex) {
- Log.e(LOG_TAG,
+ Rlog.e(LOG_TAG,
"Implausible UnsupportedEncodingException ",
uex);
return null;
@@ -302,7 +302,7 @@ public class SmsMessage extends SmsMessageBase {
userData = encodeUCS2(message, header);
encoding = ENCODING_16BIT;
} catch(UnsupportedEncodingException uex) {
- Log.e(LOG_TAG,
+ Rlog.e(LOG_TAG,
"Implausible UnsupportedEncodingException ",
uex);
return null;
@@ -312,7 +312,7 @@ public class SmsMessage extends SmsMessageBase {
if (encoding == ENCODING_7BIT) {
if ((0xff & userData[0]) > MAX_USER_DATA_SEPTETS) {
// Message too long
- Log.e(LOG_TAG, "Message too long (" + (0xff & userData[0]) + " septets)");
+ Rlog.e(LOG_TAG, "Message too long (" + (0xff & userData[0]) + " septets)");
return null;
}
// TP-Data-Coding-Scheme
@@ -327,7 +327,7 @@ public class SmsMessage extends SmsMessageBase {
} else { // assume UCS-2
if ((0xff & userData[0]) > MAX_USER_DATA_BYTES) {
// Message too long
- Log.e(LOG_TAG, "Message too long (" + (0xff & userData[0]) + " bytes)");
+ Rlog.e(LOG_TAG, "Message too long (" + (0xff & userData[0]) + " bytes)");
return null;
}
// TP-Data-Coding-Scheme
@@ -411,7 +411,7 @@ public class SmsMessage extends SmsMessageBase {
byte[] smsHeaderData = SmsHeader.toByteArray(smsHeader);
if ((data.length + smsHeaderData.length + 1) > MAX_USER_DATA_BYTES) {
- Log.e(LOG_TAG, "SMS data message may only contain "
+ Rlog.e(LOG_TAG, "SMS data message may only contain "
+ (MAX_USER_DATA_BYTES - smsHeaderData.length - 1) + " bytes");
return null;
}
@@ -472,7 +472,7 @@ public class SmsMessage extends SmsMessageBase {
if (statusReportRequested) {
// Set TP-Status-Report-Request bit.
mtiByte |= 0x20;
- if (false) Log.d(LOG_TAG, "SMS status report requested");
+ if (false) Rlog.d(LOG_TAG, "SMS status report requested");
}
bo.write(mtiByte);
@@ -530,7 +530,7 @@ public class SmsMessage extends SmsMessageBase {
ret = PhoneNumberUtils
.calledPartyBCDToString(pdu, cur, len);
} catch (RuntimeException tr) {
- Log.d(LOG_TAG, "invalid SC address: ", tr);
+ Rlog.d(LOG_TAG, "invalid SC address: ", tr);
ret = null;
}
}
@@ -564,7 +564,7 @@ public class SmsMessage extends SmsMessageBase {
try {
ret = new GsmSmsAddress(pdu, cur, lengthBytes);
} catch (ParseException e) {
- Log.e(LOG_TAG, e.getMessage());
+ Rlog.e(LOG_TAG, e.getMessage());
ret = null;
}
@@ -738,7 +738,7 @@ public class SmsMessage extends SmsMessageBase {
ret = new String(pdu, cur, byteCount, "utf-16");
} catch (UnsupportedEncodingException ex) {
ret = "";
- Log.e(LOG_TAG, "implausible UnsupportedEncodingException", ex);
+ Rlog.e(LOG_TAG, "implausible UnsupportedEncodingException", ex);
}
cur += byteCount;
@@ -759,7 +759,7 @@ public class SmsMessage extends SmsMessageBase {
ret = new String(pdu, cur, byteCount, "KSC5601");
} catch (UnsupportedEncodingException ex) {
ret = "";
- Log.e(LOG_TAG, "implausible UnsupportedEncodingException", ex);
+ Rlog.e(LOG_TAG, "implausible UnsupportedEncodingException", ex);
}
cur += byteCount;
@@ -898,15 +898,15 @@ public class SmsMessage extends SmsMessageBase {
*/
private void parsePdu(byte[] pdu) {
mPdu = pdu;
- // Log.d(LOG_TAG, "raw sms message:");
- // Log.d(LOG_TAG, s);
+ // Rlog.d(LOG_TAG, "raw sms message:");
+ // Rlog.d(LOG_TAG, s);
PduParser p = new PduParser(pdu);
scAddress = p.getSCAddress();
if (scAddress != null) {
- if (false) Log.d(LOG_TAG, "SMS SC address: " + scAddress);
+ if (false) Rlog.d(LOG_TAG, "SMS SC address: " + scAddress);
}
// TODO(mkf) support reply path, user data header indicator
@@ -992,7 +992,7 @@ public class SmsMessage extends SmsMessageBase {
originatingAddress = p.getAddress();
if (originatingAddress != null) {
- if (false) Log.v(LOG_TAG, "SMS originating address: "
+ if (false) Rlog.v(LOG_TAG, "SMS originating address: "
+ originatingAddress.address);
}
@@ -1005,13 +1005,13 @@ public class SmsMessage extends SmsMessageBase {
dataCodingScheme = p.getByte();
if (false) {
- Log.v(LOG_TAG, "SMS TP-PID:" + protocolIdentifier
+ Rlog.v(LOG_TAG, "SMS TP-PID:" + protocolIdentifier
+ " data coding scheme: " + dataCodingScheme);
}
scTimeMillis = p.getSCTimestampMillis();
- if (false) Log.d(LOG_TAG, "SMS SC timestamp: " + scTimeMillis);
+ if (false) Rlog.d(LOG_TAG, "SMS SC timestamp: " + scTimeMillis);
boolean hasUserDataHeader = (firstByte & 0x40) == 0x40;
@@ -1039,7 +1039,7 @@ public class SmsMessage extends SmsMessageBase {
hasMessageClass = (0 != (dataCodingScheme & 0x10));
if (userDataCompressed) {
- Log.w(LOG_TAG, "4 - Unsupported SMS data coding scheme "
+ Rlog.w(LOG_TAG, "4 - Unsupported SMS data coding scheme "
+ "(compression) " + (dataCodingScheme & 0xff));
} else {
switch ((dataCodingScheme >> 2) & 0x3) {
@@ -1053,7 +1053,7 @@ public class SmsMessage extends SmsMessageBase {
case 1: // 8 bit data
case 3: // reserved
- Log.w(LOG_TAG, "1 - Unsupported SMS data coding scheme "
+ Rlog.w(LOG_TAG, "1 - Unsupported SMS data coding scheme "
+ (dataCodingScheme & 0xff));
encodingType = ENCODING_8BIT;
break;
@@ -1098,7 +1098,7 @@ public class SmsMessage extends SmsMessageBase {
} else {
isMwi = false;
- Log.w(LOG_TAG, "MWI for fax, email, or other "
+ Rlog.w(LOG_TAG, "MWI for fax, email, or other "
+ (dataCodingScheme & 0xff));
}
} else if ((dataCodingScheme & 0xC0) == 0x80) {
@@ -1108,11 +1108,11 @@ public class SmsMessage extends SmsMessageBase {
// This value used for KSC5601 by carriers in Korea.
encodingType = ENCODING_KSC5601;
} else {
- Log.w(LOG_TAG, "5 - Unsupported SMS data coding scheme "
+ Rlog.w(LOG_TAG, "5 - Unsupported SMS data coding scheme "
+ (dataCodingScheme & 0xff));
}
} else {
- Log.w(LOG_TAG, "3 - Unsupported SMS data coding scheme "
+ Rlog.w(LOG_TAG, "3 - Unsupported SMS data coding scheme "
+ (dataCodingScheme & 0xff));
}
@@ -1143,7 +1143,7 @@ public class SmsMessage extends SmsMessageBase {
break;
}
- if (false) Log.v(LOG_TAG, "SMS message body (raw): '" + messageBody + "'");
+ if (false) Rlog.v(LOG_TAG, "SMS message body (raw): '" + messageBody + "'");
if (messageBody != null) {
parseMessageBody();
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 08:18:18 +0000