Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92fb1668 authored by Simon Wilson's avatar Simon Wilson Committed by Android Git Automerger
Browse files

am 10993b2d: am 6b6869d5: Merge "mms: mms wap push length check before pdu... 

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

* commit '10993b2d':
  mms: mms wap push length check before pdu processing.
parents 73179134 10993b2d

telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java

+9 −9
Original line number Original line Diff line number Diff line
@@ -1013,7 +1013,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.
@@ -1024,6 +1023,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);