am ad10642b: am 380be4a4: am 6fe2a8a4: Merge "Handle the case when TP-PI reserved bits are set" (b142fa0d) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/gsm/SmsMessage.java

+16 −12

Original line number	Diff line number	Diff line
		@@ -966,6 +966,9 @@ public class SmsMessage extends SmsMessageBase {
		// additional TP-PI octets.
		moreExtraParams = p.getByte();
		}
		// As per 3GPP 23.040 section 9.2.3.27 TP-Parameter-Indicator,
		// only process the byte if the reserved bits (bits3 to 6) are zero.
		if ((extraParams & 0x78) == 0) {
		// TP-Protocol-Identifier
		if ((extraParams & 0x01) != 0) {
		protocolIdentifier = p.getByte();
		@@ -981,6 +984,7 @@ public class SmsMessage extends SmsMessageBase {
		}
		}
		}
		}

		private void parseSmsDeliver(PduParser p, int firstByte) {
		replyPathPresent = (firstByte & 0x80) == 0x80;