fascinate: fix parsing of incoming sms' messageId (70cb78d9) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/cdma/sms/BearerData.java

+15 −4

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import static android.telephony.SmsMessage.ENCODING_16BIT;
		import static android.telephony.SmsMessage.MAX_USER_DATA_BYTES;
		import static android.telephony.SmsMessage.MAX_USER_DATA_BYTES_WITH_HEADER;

		import android.os.SystemProperties;

		import android.util.Log;

		import android.telephony.SmsMessage;
		@@ -876,11 +878,20 @@ public final class BearerData {
		paramBits -= EXPECTED_PARAM_SIZE;
		decodeSuccess = true;
		bData.messageType = inStream.read(4);
		// Samsung Fascinate parses messageId differently than other devices
		// fix it here so that incoming sms works correctly
		if ("fascinatemtd".equals(SystemProperties.get("ro.product.device"))) {
		inStream.skip(4);
		bData.messageId = inStream.read(8) << 8;
		bData.messageId \|= inStream.read(8);
		bData.hasUserDataHeader = (inStream.read(8) == 1);
		} else {
		bData.messageId = inStream.read(8) << 8;
		bData.messageId \|= inStream.read(8);
		bData.hasUserDataHeader = (inStream.read(1) == 1);
		inStream.skip(3);
		}
		}
		if ((! decodeSuccess) \|\| (paramBits > 0)) {
		Log.d(LOG_TAG, "MESSAGE_IDENTIFIER decode " +
		(decodeSuccess ? "succeeded" : "failed") +