Merge "Parse CellcomFormat WAP PUSH SMS" into qt-qpr1-dev (95958e2f) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -143,6 +143,7 @@ public class VisualVoicemailSmsFilter {
		return false;
		}

		String clientPrefix = settings.clientPrefix;
		FullMessage fullMessage = getFullMessage(pdus, format);

		if (fullMessage == null) {
		@@ -152,6 +153,10 @@ public class VisualVoicemailSmsFilter {
		String asciiMessage = parseAsciiPduMessage(pdus);
		WrappedMessageData messageData = VisualVoicemailSmsParser
		.parseAlternativeFormat(asciiMessage);
		if (messageData == null) {
		Log.i(TAG, "Attempt to parse ascii PDU");
		messageData = VisualVoicemailSmsParser.parse(clientPrefix, asciiMessage);
		}
		if (messageData != null) {
		sendVvmSmsBroadcast(context, settings, phoneAccountHandle, messageData, null);
		}
		@@ -161,7 +166,6 @@ public class VisualVoicemailSmsFilter {
		}

		String messageBody = fullMessage.fullMessageBody;
		String clientPrefix = settings.clientPrefix;
		WrappedMessageData messageData = VisualVoicemailSmsParser
		.parse(clientPrefix, messageBody);
		if (messageData != null) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,7 +16,9 @@
		package com.android.internal.telephony;

		import android.test.suitebuilder.annotation.SmallTest;

		import com.android.internal.telephony.VisualVoicemailSmsParser.WrappedMessageData;

		import junit.framework.TestCase;

		public class VisualVoicemailSmsParserTest extends TestCase {