Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "mms: mms wap push length check before pdu processing." into gingerbread

Browse Source
This commit is contained in:
Simon Wilson
2011-03-07 15:39:19 -08:00
committed by Android (Google) Code Review
parent d581c04722 7ac1cb787c
commit 6b6869d5c1
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java
View File

@@ -1015,7 +1015,6 @@ public final class BearerData {
boolean decodingtypeUTF8 = Resources.getSystem() boolean decodingtypeUTF8 = Resources.getSystem()
.getBoolean(com.android.internal.R.bool.config_sms_utf8_support); .getBoolean(com.android.internal.R.bool.config_sms_utf8_support);
if (!decodingtypeUTF8) {
// Strip off any padding bytes, meaning any differences between the length of the // Strip off any padding bytes, meaning any differences between the length of the
// array and the target length specified by numFields. This is to avoid any // array and the target length specified by numFields. This is to avoid any
// confusion by code elsewhere that only considers the payload array length. // confusion by code elsewhere that only considers the payload array length.
@@ -1026,6 +1025,7 @@ public final class BearerData {
System.arraycopy(userData.payload, 0, payload, 0, copyLen); System.arraycopy(userData.payload, 0, payload, 0, copyLen);
userData.payload = payload; userData.payload = payload;
if (!decodingtypeUTF8) {
// There are many devices in the market that send 8bit text sms (latin encoded) as // There are many devices in the market that send 8bit text sms (latin encoded) as
// octet encoded. // octet encoded.
userData.payloadStr = decodeLatin(userData.payload, offset, userData.numFields); userData.payloadStr = decodeLatin(userData.payload, offset, userData.numFields);