Check CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES always am: f3ea99181b

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1325631

Change-Id: If82c2db8dc767a806360c91c55a056cddd2f06a9
This commit is contained in:
Taesu Lee
2020-06-08 17:08:29 +00:00
committed by Automerger Merge Worker
+2 -9
View File
@@ -64,9 +64,6 @@ public class SmsSender {
private static final Random RANDOM = new Random(); private static final Random RANDOM = new Random();
// Whether we should send multipart SMS as separate messages
private static Boolean sSendMultipartSmsAsSeparateMessages = null;
/** /**
* Class that holds the sent status for all parts of a multipart message sending * Class that holds the sent status for all parts of a multipart message sending
*/ */
@@ -180,7 +177,7 @@ public class SmsSender {
} }
// This should be called from a RequestWriter queue thread // This should be called from a RequestWriter queue thread
public static SendResult sendMessage(final Context context, final int subId, String dest, public static SendResult sendMessage(final Context context, final int subId, String dest,
String message, final String serviceCenter, final boolean requireDeliveryReport, String message, final String serviceCenter, final boolean requireDeliveryReport,
final Uri messageUri) throws SmsException { final Uri messageUri) throws SmsException {
if (LogUtil.isLoggable(TAG, LogUtil.VERBOSE)) { if (LogUtil.isLoggable(TAG, LogUtil.VERBOSE)) {
@@ -281,12 +278,8 @@ public class SmsSender {
messageUri, partId, subId), messageUri, partId, subId),
0/*flag*/)); 0/*flag*/));
} }
if (sSendMultipartSmsAsSeparateMessages == null) {
sSendMultipartSmsAsSeparateMessages = MmsConfig.get(subId)
.getSendMultipartSmsAsSeparateMessages();
}
try { try {
if (sSendMultipartSmsAsSeparateMessages) { if (MmsConfig.get(subId).getSendMultipartSmsAsSeparateMessages()) {
// If multipart sms is not supported, send them as separate messages // If multipart sms is not supported, send them as separate messages
for (int i = 0; i < messageCount; i++) { for (int i = 0; i < messageCount; i++) {
smsManager.sendTextMessage(dest, smsManager.sendTextMessage(dest,