Unit test for CdmaSmsDispatcher (67e0eff1) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/ImsSMSDispatcher.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -273,7 +273,7 @@ public class ImsSMSDispatcher extends SMSDispatcher {
		}

		// format didn't match, need to re-encode.
		HashMap map = tracker.mData;
		HashMap map = tracker.getData();

		// to re-encode, fields needed are: scAddr, destAddr, and
		// text if originally sent as sendText or

src/java/com/android/internal/telephony/SMSDispatcher.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -367,7 +367,7 @@ public abstract class SMSDispatcher extends Handler {

		@Override
		protected void onServiceReady(ICarrierMessagingService carrierMessagingService) {
		HashMap<String, Object> map = mTracker.mData;
		HashMap<String, Object> map = mTracker.getData();
		String text = (String) map.get("text");

		if (text != null) {
		@@ -399,7 +399,7 @@ public abstract class SMSDispatcher extends Handler {

		@Override
		protected void onServiceReady(ICarrierMessagingService carrierMessagingService) {
		HashMap<String, Object> map = mTracker.mData;
		HashMap<String, Object> map = mTracker.getData();
		byte[] data = (byte[]) map.get("data");
		int destPort = (int) map.get("destPort");

		@@ -948,7 +948,7 @@ public abstract class SMSDispatcher extends Handler {
		* -param destAddr the destination phone number (for short code confirmation)
		*/
		protected void sendRawPdu(SmsTracker tracker) {
		HashMap map = tracker.mData;
		HashMap map = tracker.getData();
		byte pdu[] = (byte[]) map.get("pdu");

		if (mSmsSendDisabled) {
		@@ -1248,7 +1248,7 @@ public abstract class SMSDispatcher extends Handler {
		ArrayList<PendingIntent> sentIntents;
		ArrayList<PendingIntent> deliveryIntents;

		HashMap<String, Object> map = tracker.mData;
		HashMap<String, Object> map = tracker.getData();

		String destinationAddress = (String) map.get("destination");
		String scAddress = (String) map.get("scaddress");
		@@ -1279,9 +1279,9 @@ public abstract class SMSDispatcher extends Handler {
		* Keeps track of an SMS that has been sent to the RIL, until it has
		* successfully been sent, or we're done trying.
		*/
		protected static final class SmsTracker {
		public static class SmsTracker {
		// fields need to be public for derived SmsDispatchers
		public final HashMap<String, Object> mData;
		private final HashMap<String, Object> mData;
		public int mRetryCount;
		public int mImsRetry; // nonzero indicates initial message was sent over Ims
		public int mMessageRef;
		@@ -1346,6 +1346,10 @@ public abstract class SMSDispatcher extends Handler {
		return mData.containsKey("parts");
		}

		public HashMap<String, Object> getData() {
		return mData;
		}

		/**
		* Update the status of this message if we persisted it
		*/

src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java

+7 −12

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ public class CdmaSMSDispatcher extends SMSDispatcher {
		}

		@Override
		protected String getFormat() {
		public String getFormat() {
		return SmsConstants.FORMAT_3GPP2;
		}

		@@ -64,7 +64,7 @@ public class CdmaSMSDispatcher extends SMSDispatcher {
		* Send the SMS status report to the dispatcher thread to process.
		* @param sms the CDMA SMS message containing the status report
		*/
		void sendStatusReportMessage(SmsMessage sms) {
		public void sendStatusReportMessage(SmsMessage sms) {
		if (VDBG) Rlog.d(TAG, "sending EVENT_HANDLE_STATUS_REPORT message");
		sendMessage(obtainMessage(EVENT_HANDLE_STATUS_REPORT, sms));
		}
		@@ -83,7 +83,7 @@ public class CdmaSMSDispatcher extends SMSDispatcher {
		* Called from parent class to handle status report from {@code CdmaInboundSmsHandler}.
		* @param sms the CDMA SMS message to process
		*/
		void handleCdmaStatusReport(SmsMessage sms) {
		private void handleCdmaStatusReport(SmsMessage sms) {
		for (int i = 0, count = deliveryPendingList.size(); i < count; i++) {
		SmsTracker tracker = deliveryPendingList.get(i);
		if (tracker.mMessageRef == sms.mMessageRef) {
		@@ -106,7 +106,7 @@ public class CdmaSMSDispatcher extends SMSDispatcher {

		/** {@inheritDoc} */
		@Override
		protected void sendData(String destAddr, String scAddr, int destPort,
		public void sendData(String destAddr, String scAddr, int destPort,
		byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		SmsMessage.SubmitPdu pdu = SmsMessage.getSubmitPdu(
		scAddr, destAddr, destPort, data, (deliveryIntent != null));
		@@ -139,7 +139,7 @@ public class CdmaSMSDispatcher extends SMSDispatcher {

		/** {@inheritDoc} */
		@Override
		protected void sendText(String destAddr, String scAddr, String text, PendingIntent sentIntent,
		public void sendText(String destAddr, String scAddr, String text, PendingIntent sentIntent,
		PendingIntent deliveryIntent, Uri messageUri, String callingPkg,
		boolean persistMessage) {
		SmsMessage.SubmitPdu pdu = SmsMessage.getSubmitPdu(
		@@ -229,12 +229,7 @@ public class CdmaSMSDispatcher extends SMSDispatcher {

		/** {@inheritDoc} */
		@Override
		protected void sendSms(SmsTracker tracker) {
		HashMap<String, Object> map = tracker.mData;

		// byte[] smsc = (byte[]) map.get("smsc"); // unused for CDMA
		byte[] pdu = (byte[]) map.get("pdu");

		public void sendSms(SmsTracker tracker) {
		Rlog.d(TAG, "sendSms: "
		+ " isIms()=" + isIms()
		+ " mRetryCount=" + tracker.mRetryCount
		@@ -256,7 +251,7 @@ public class CdmaSMSDispatcher extends SMSDispatcher {
		}

		Message reply = obtainMessage(EVENT_SEND_SMS_COMPLETE, tracker);
		byte[] pdu = (byte[]) tracker.mData.get("pdu");
		byte[] pdu = (byte[]) tracker.getData().get("pdu");

		int currentDataNetwork = mPhone.getServiceState().getDataNetworkType();
		boolean imsSmsDisabled = (currentDataNetwork == TelephonyManager.NETWORK_TYPE_EHRPD

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher {
		/** {@inheritDoc} */
		@Override
		protected void sendSms(SmsTracker tracker) {
		HashMap<String, Object> map = tracker.mData;
		HashMap<String, Object> map = tracker.getData();

		byte pdu[] = (byte[]) map.get("pdu");

		@@ -282,7 +282,7 @@ public final class GsmSMSDispatcher extends SMSDispatcher {
		return;
		}

		HashMap<String, Object> map = tracker.mData;
		HashMap<String, Object> map = tracker.getData();

		byte smsc[] = (byte[]) map.get("smsc");
		byte[] pdu = (byte[]) map.get("pdu");

src/java/com/android/internal/telephony/test/SimulatedCommands.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1610,6 +1610,7 @@ public class SimulatedCommands extends BaseCommands
		@Override
		public void sendCdmaSms(byte[] pdu, Message response){
		Rlog.w(LOG_TAG, "CDMA not implemented in SimulatedCommands");
		SimulatedCommandsVerifier.getInstance().sendCdmaSms(pdu, response);
		}

		@Override