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

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

Browse Source 
* commit '6b6869d5c1a203e79dc272f2f0e53c184f44f24a':
  mms: mms wap push length check before pdu processing.
This commit is contained in:
Simon Wilson
2011-03-07 15:42:59 -08:00
committed by Android Git Automerger
parent b1be086e1d 6b6869d5c1
commit 10993b2d1e
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1015,17 +1015,17 @@ 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);
// 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
// confusion by code elsewhere that only considers the payload array length.
byte[] payload = new byte[userData.numFields];
int copyLen = userData.numFields < userData.payload.length
? userData.numFields : userData.payload.length;
System.arraycopy(userData.payload, 0, payload, 0, copyLen);
userData.payload = payload;
if (!decodingtypeUTF8) { if (!decodingtypeUTF8) {
// 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
// confusion by code elsewhere that only considers the payload array length.
byte[] payload = new byte[userData.numFields];
int copyLen = userData.numFields < userData.payload.length
? userData.numFields : userData.payload.length;
System.arraycopy(userData.payload, 0, payload, 0, copyLen);
userData.payload = payload;
// 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);