Merge "Fixed incorrect WAC decoding" into qt-qpr1-dev (fa351527) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -214,7 +214,7 @@ public class GsmSmsCbMessage {
	private static Pair<Integer, List<Geometry>> parseWarningAreaCoordinates(		private static Pair<Integer, List<Geometry>> parseWarningAreaCoordinates(
	byte[] pdu, int wacOffset) {		byte[] pdu, int wacOffset) {
	// little-endian		// little-endian
	int wacDataLength = (pdu[wacOffset + 1] << 8) \| pdu[wacOffset];		int wacDataLength = ((pdu[wacOffset + 1] & 0xff) << 8) \| (pdu[wacOffset] & 0xff);
	int offset = wacOffset + 2;		int offset = wacOffset + 2;

	if (offset + wacDataLength > pdu.length) {		if (offset + wacDataLength > pdu.length) {