Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Merge "Add comments for boolean parameters in translate()." am: a844340276 am: b404dada78" into qt-dev-plus-aosp am: cb6e3d0eca" into qt-r1-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-05-22 13:51:53 +00:00
committed by Android (Google) Code Review
parent 03a7eb3372 a7230a270a
commit 624bd12bd1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/com/android/internal/telephony/cdma/SmsMessage.java
View File

@@ -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;

2
telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
View File

@@ -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;