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

Commit 392afa32 authored by Wink Saville's avatar Wink Saville Committed by Gerrit Code Review
Browse files

Merge "Parameters length is able to be over 127 bytes."

parents eabfd15c e72ec3f4

src/java/com/android/internal/telephony/cdma/SmsMessage.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -488,7 +488,7 @@ public class SmsMessage extends SmsMessageBase { 
    private void parsePdu(byte[] pdu) {

    private void parsePdu(byte[] pdu) {

        ByteArrayInputStream bais = new ByteArrayInputStream(pdu);

        ByteArrayInputStream bais = new ByteArrayInputStream(pdu);

        DataInputStream dis = new DataInputStream(bais);

        DataInputStream dis = new DataInputStream(bais);

        byte length;

        int length;

        int bearerDataLength;

        int bearerDataLength;

        SmsEnvelope env = new SmsEnvelope();

        SmsEnvelope env = new SmsEnvelope();

        CdmaSmsAddress addr = new CdmaSmsAddress();

        CdmaSmsAddress addr = new CdmaSmsAddress();
@@ -503,7 +503,7 @@ public class SmsMessage extends SmsMessageBase { 
            addr.ton = dis.readByte();

            addr.ton = dis.readByte();

            addr.numberPlan = dis.readByte();

            addr.numberPlan = dis.readByte();





            length = dis.readByte();

            length = dis.readUnsignedByte();

            addr.numberOfDigits = length;

            addr.numberOfDigits = length;

            addr.origBytes = new byte[length];

            addr.origBytes = new byte[length];

            dis.read(addr.origBytes, 0, length); // digits

            dis.read(addr.origBytes, 0, length); // digits
@@ -547,7 +547,7 @@ public class SmsMessage extends SmsMessageBase { 




            while (dis.available() > 0) {

            while (dis.available() > 0) {

                int parameterId = dis.readByte();

                int parameterId = dis.readByte();

                int parameterLen = dis.readByte();

                int parameterLen = dis.readUnsignedByte();

                byte[] parameterData = new byte[parameterLen];

                byte[] parameterData = new byte[parameterLen];





                switch (parameterId) {

                switch (parameterId) {