Merge change 186 into donut (a6c6f06b) · Commits · e / os / android_frameworks_base

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

+6 −19

Original line number	Diff line number	Diff line
		@@ -1099,14 +1099,9 @@ public final class SIMRecords extends IccRecords {

		// Note: Data may include trailing FF's. That's OK; message
		// should still parse correctly.
		byte[] nba = new byte[n - 1];
		System.arraycopy(ba, 1, nba, 0, n - 1);

		String pdu = IccUtils.bytesToHexString(nba);
		// XXX first line is bogus
		SmsMessage message = SmsMessage.newFromCMT(
		new String[] { "", pdu });

		byte[] pdu = new byte[n - 1];
		System.arraycopy(ba, 1, pdu, 0, n - 1);
		SmsMessage message = SmsMessage.createFromPdu(pdu);

		((GSMPhone) phone).mSMS.dispatchMessage(message);
		}
		@@ -1130,14 +1125,9 @@ public final class SIMRecords extends IccRecords {

		// Note: Data may include trailing FF's. That's OK; message
		// should still parse correctly.
		byte[] nba = new byte[n - 1];
		System.arraycopy(ba, 1, nba, 0, n - 1);

		String pdu = IccUtils.bytesToHexString(nba);
		// XXX first line is bogus
		SmsMessage message = SmsMessage.newFromCMT(
		new String[] { "", pdu });

		byte[] pdu = new byte[n - 1];
		System.arraycopy(ba, 1, pdu, 0, n - 1);
		SmsMessage message = SmsMessage.createFromPdu(pdu);

		((GSMPhone) phone).mSMS.dispatchMessage(message);

		@@ -1499,6 +1489,3 @@ public final class SIMRecords extends IccRecords {
		}

		}