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

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

Merge "Merge "Merge "Add comments for boolean parameters in translate()." am:... 

Merge "Merge "Merge "Add comments for boolean parameters in translate()." am: a8443402 am: b404dada" into qt-dev-plus-aosp am: cb6e3d0e" into qt-r1-dev-plus-aosp
am: 624bd12b

Change-Id: I131dcbeb0455d05641e6c271cfc948243b1b9a1d
parents de75c427 624bd12b

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

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ public class SmsMessage extends SmsMessageBase { 
        CharSequence newMsgBody = null;

        Resources r = Resources.getSystem();

        if (r.getBoolean(com.android.internal.R.bool.config_sms_force_7bit_encoding)) {

            newMsgBody = Sms7BitEncodingTranslator.translate(messageBody, true);

            newMsgBody = Sms7BitEncodingTranslator.translate(messageBody, true /* isCdmaFormat */);

        }

        if (TextUtils.isEmpty(newMsgBody)) {

            newMsgBody = messageBody;

telephony/java/com/android/internal/telephony/gsm/SmsMessage.java

+1 −1
Original line number Diff line number Diff line
@@ -914,7 +914,7 @@ public class SmsMessage extends SmsMessageBase { 
        CharSequence newMsgBody = null;

        Resources r = Resources.getSystem();

        if (r.getBoolean(com.android.internal.R.bool.config_sms_force_7bit_encoding)) {

            newMsgBody = Sms7BitEncodingTranslator.translate(msgBody, false);

            newMsgBody = Sms7BitEncodingTranslator.translate(msgBody, false /* isCdmaFormat */);

        }

        if (TextUtils.isEmpty(newMsgBody)) {

            newMsgBody = msgBody;