Merge "Fixed the formatting issue of SmsController on x-message-id." (73803838) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/SmsController.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -240,14 +240,14 @@ public class SmsController extends ISmsImplBase {
		String scAddr, String text, PendingIntent sentIntent, PendingIntent deliveryIntent,
		boolean persistMessageForNonDefaultSmsApp, long messageId) {
		Rlog.d(LOG_TAG, "sendTextForSubscriber iccSmsIntMgr"
		+ " Subscription: " + subId + " id: " + messageId);
		+ " Subscription: " + subId + " " + formatCrossStackMessageId(messageId));
		IccSmsInterfaceManager iccSmsIntMgr = getIccSmsInterfaceManager(subId);
		if (iccSmsIntMgr != null) {
		iccSmsIntMgr.sendText(callingPackage, destAddr, scAddr, text, sentIntent,
		deliveryIntent, persistMessageForNonDefaultSmsApp, messageId);
		} else {
		Rlog.e(LOG_TAG, "sendTextForSubscriber iccSmsIntMgr is null for"
		+ " Subscription: " + subId + " id: " + messageId);
		+ " Subscription: " + subId + " " + formatCrossStackMessageId(messageId));
		sendErrorInPendingIntent(sentIntent, SmsManager.RESULT_ERROR_GENERIC_FAILURE);
		}
		}
		@@ -318,7 +318,7 @@ public class SmsController extends ISmsImplBase {
		messageId);
		} else {
		Rlog.e(LOG_TAG, "sendMultipartTextForSubscriber iccSmsIntMgr is null for"
		+ " Subscription: " + subId + " id: " + messageId);
		+ " Subscription: " + subId + " " + formatCrossStackMessageId(messageId));
		sendErrorInPendingIntents(sentIntents, SmsManager.RESULT_ERROR_GENERIC_FAILURE);
		}
		}