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

Commit c0f522c3 authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56 am:... 

Merge "Fix invalid padding bits for 7-bit ASCII encoding" am: 2c8d3c56 am: c302ce55 am: 1a9034d4
am: 66460139

Change-Id: Idac3364a23d0e10b5b93097eddcbbeb7718755ec
parents f4d962c2 66460139

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

+7 −7
Original line number Diff line number Diff line
@@ -764,13 +764,13 @@ public final class BearerData { 
                                      " > " + SmsConstants.MAX_USER_DATA_BYTES + " bytes)");

        }



        /*

         * TODO(cleanup): figure out what the right answer is WRT paddingBits field

         *

         *   userData.paddingBits = (userData.payload.length * 8) - (userData.numFields * 7);

         *   userData.paddingBits = 0; // XXX this seems better, but why?

         *

         */

        if (bData.userData.msgEncoding == UserData.ENCODING_7BIT_ASCII) {

            bData.userData.paddingBits =

                    (bData.userData.payload.length * 8) - (bData.userData.numFields * 7);

        } else {

            bData.userData.paddingBits = 0;

        }



        int dataBits = (bData.userData.payload.length * 8) - bData.userData.paddingBits;

        int paramBits = dataBits + 13;

        if ((bData.userData.msgEncoding == UserData.ENCODING_IS91_EXTENDED_PROTOCOL) ||