Merge "Fix check of the size of the alpha identifier" (52d980e6) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/AdnRecord.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -226,9 +226,13 @@ public class AdnRecord implements Parcelable {
		Rlog.w(LOG_TAG,
		"[buildAdnString] Max length of dialing number is 20");
		return null;
		} else if (mAlphaTag != null && mAlphaTag.length() > footerOffset) {
		Rlog.w(LOG_TAG,
		"[buildAdnString] Max length of tag is " + footerOffset);
		}

		byteTag = !TextUtils.isEmpty(mAlphaTag) ? GsmAlphabet.stringToGsm8BitPacked(mAlphaTag)
		: new byte[0];

		if (byteTag.length > footerOffset) {
		Rlog.w(LOG_TAG, "[buildAdnString] Max length of tag is " + footerOffset);
		return null;
		} else {
		bcdNumber = PhoneNumberUtils.numberToCalledPartyBCD(mNumber);
		@@ -243,8 +247,7 @@ public class AdnRecord implements Parcelable {
		adnString[footerOffset + ADN_EXTENSION_ID]
		= (byte) 0xFF; // Extension Record Id

		if (!TextUtils.isEmpty(mAlphaTag)) {
		byteTag = GsmAlphabet.stringToGsm8BitPacked(mAlphaTag);
		if (byteTag.length > 0) {
		System.arraycopy(byteTag, 0, adnString, 0, byteTag.length);
		}