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

Commit c380e84e authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Fix IMS SMS calculateLength bug" am: b51a15c4 am: c68d9422 

am: a86feca8

Change-Id: I1d5747978c28d560da2bb2594808107dfec3d39b
parents ff243f35 a86feca8

src/java/com/android/internal/telephony/util/SMSDispatcherUtil.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -267,8 +267,8 @@ public final class SMSDispatcherUtil { 
     */

     */

    public static TextEncodingDetails calculateLengthGsm(CharSequence messageBody,

    public static TextEncodingDetails calculateLengthGsm(CharSequence messageBody,

            boolean use7bitOnly) {

            boolean use7bitOnly) {

        return com.android.internal.telephony.cdma.SmsMessage.calculateLength(messageBody,

        return com.android.internal.telephony.gsm.SmsMessage.calculateLength(messageBody,

                use7bitOnly, false);

                use7bitOnly);





    }

    }
@@ -281,7 +281,7 @@ public final class SMSDispatcherUtil { 
     */

     */

    public static TextEncodingDetails calculateLengthCdma(CharSequence messageBody,

    public static TextEncodingDetails calculateLengthCdma(CharSequence messageBody,

            boolean use7bitOnly) {

            boolean use7bitOnly) {

        return com.android.internal.telephony.gsm.SmsMessage.calculateLength(messageBody,

        return com.android.internal.telephony.cdma.SmsMessage.calculateLength(messageBody,

                use7bitOnly);

                use7bitOnly, false);

    }

    }

}
 
}