Check CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES always
Check CONFIG_SEND_MULTIPART_SMS_AS_SEPARATE_MESSAGES directly for each
sending messages always so that the correct config can be used for each
SIM cards in multi-sim devices.
Test: Manual
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Iff80d093f43014ff2fe97caf6929aefe43911192
diff --git a/src/com/android/messaging/sms/SmsSender.java b/src/com/android/messaging/sms/SmsSender.java
index 889973f..e429995 100644
--- a/src/com/android/messaging/sms/SmsSender.java
+++ b/src/com/android/messaging/sms/SmsSender.java
@@ -64,9 +64,6 @@
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
*/
@@ -180,7 +177,7 @@
}
// 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,
final Uri messageUri) throws SmsException {
if (LogUtil.isLoggable(TAG, LogUtil.VERBOSE)) {
@@ -281,12 +278,8 @@
messageUri, partId, subId),
0/*flag*/));
}
- if (sSendMultipartSmsAsSeparateMessages == null) {
- sSendMultipartSmsAsSeparateMessages = MmsConfig.get(subId)
- .getSendMultipartSmsAsSeparateMessages();
- }
try {
- if (sSendMultipartSmsAsSeparateMessages) {
+ if (MmsConfig.get(subId).getSendMultipartSmsAsSeparateMessages()) {
// If multipart sms is not supported, send them as separate messages
for (int i = 0; i < messageCount; i++) {
smsManager.sendTextMessage(dest,