Merge "Assisted dialing support of Multi-part SMS" into lmp-mr1-dev (e1ca3096) · Commits · e / os / android_frameworks_opt_telephony

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -468,6 +468,8 @@ public class IccSmsInterfaceManager {
		return;
		}

		destAddr = filterDestAddress(destAddr);

		if (parts.size() > 1 && parts.size() < 10 && !SmsMessage.hasEmsSupport()) {
		for (int i = 0; i < parts.size(); i++) {
		// If EMS is not supported, we have to break down EMS into single segment SMS
		@@ -929,6 +931,8 @@ public class IccSmsInterfaceManager {
		return;
		}

		textAndAddress[1] = filterDestAddress(textAndAddress[1]);

		if (parts.size() > 1 && parts.size() < 10 && !SmsMessage.hasEmsSupport()) {
		for (int i = 0; i < parts.size(); i++) {
		// If EMS is not supported, we have to break down EMS into single segment SMS
		@@ -956,7 +960,6 @@ public class IccSmsInterfaceManager {
		return;
		}

		textAndAddress[1] = filterDestAddress(textAndAddress[1]);
		mDispatcher.sendMultipartText(
		textAndAddress[1], // destAddress
		scAddress,