Merge "Fix the IndexOutOfBoundsException when unpacking GSM 8-bit pdu" into lmp-dev (f11b43d8) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/GsmAlphabet.java

+12 −3

Original line number	Diff line number	Diff line
		@@ -609,16 +609,25 @@ public class GsmAlphabet {
		}
		} else {
		if (prevWasEscape) {
		char shiftChar = shiftTableToChar.charAt(c);
		char shiftChar =
		c < shiftTableToChar.length() ? shiftTableToChar.charAt(c) : ' ';
		if (shiftChar == ' ') {
		// display character from main table if not present in shift table
		if (c < languageTableToChar.length()) {
		ret.append(languageTableToChar.charAt(c));
		} else {
		ret.append(' ');
		}
		} else {
		ret.append(shiftChar);
		}
		} else {
		if (!isMbcs \|\| c < 0x80 \|\| i + 1 >= offset + length) {
		if (c < languageTableToChar.length()) {
		ret.append(languageTableToChar.charAt(c));
		} else {
		ret.append(' ');
		}
		} else {
		// isMbcs must be true. So both mbcsBuffer and charset are initialized.
		mbcsBuffer.clear();