Merge change 22886 into eclair (c98d68cd) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SmsManager.java

+10 −37

Original line number	Diff line number	Diff line
		@@ -81,9 +81,14 @@ public final class SmsManager {
		throw new IllegalArgumentException("Invalid message body");
		}

		SmsMessage.SubmitPdu pdus = SmsMessage.getSubmitPdu(
		scAddress, destinationAddress, text, (deliveryIntent != null));
		sendRawPdu(pdus.encodedScAddress, pdus.encodedMessage, sentIntent, deliveryIntent);
		try {
		ISms iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
		if (iccISms != null) {
		iccISms.sendText(destinationAddress, scAddress, text, sentIntent, deliveryIntent);
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		}

		/**
		@@ -202,43 +207,11 @@ public final class SmsManager {
		throw new IllegalArgumentException("Invalid message data");
		}

		SmsMessage.SubmitPdu pdus = SmsMessage.getSubmitPdu(
		scAddress, destinationAddress,
		destinationPort, data, (deliveryIntent != null));
		sendRawPdu(pdus.encodedScAddress, pdus.encodedMessage, sentIntent, deliveryIntent);
		}

		/**
		* Send a raw SMS PDU.
		* A PDU is a protocol data unit. It contains the message and the
		* associated meta information.
		*
		* @param smsc the SMSC to send the message through, or NULL for the
		* default SMSC
		* @param pdu the raw PDU to send
		* @param sentIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is successfully sent, or failed.
		* The result code will be <code>Activity.RESULT_OK<code> for success,
		* or one of these errors:<br>
		* <code>RESULT_ERROR_GENERIC_FAILURE</code><br>
		* <code>RESULT_ERROR_RADIO_OFF</code><br>
		* <code>RESULT_ERROR_NULL_PDU</code><br>
		* For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include
		* the extra "errorCode" containing a radio technology specific value,
		* generally only useful for troubleshooting.<br>
		* The per-application based SMS control checks sentIntent. If sentIntent
		* is NULL the caller will be checked against all unknown applications,
		* which cause smaller number of SMS to be sent in checking period.
		* @param deliveryIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		*/
		private void sendRawPdu(byte[] smsc, byte[] pdu, PendingIntent sentIntent,
		PendingIntent deliveryIntent) {
		try {
		ISms iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
		if (iccISms != null) {
		iccISms.sendRawPdu(smsc, pdu, sentIntent, deliveryIntent);
		iccISms.sendData(destinationAddress, scAddress, destinationPort & 0xFFFF,
		data, sentIntent, deliveryIntent);
		}
		} catch (RemoteException ex) {
		// ignore it

telephony/java/android/telephony/SmsMessage.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -350,6 +350,25 @@ public class SmsMessage {
		return calculateLength((CharSequence)messageBody, use7bitOnly);
		}

		/*
		* TODO(cleanup): It looks like there is now no useful reason why
		* apps should generate pdus themselves using these routines,
		* instead of handing the raw data to SMSDispatcher (and thereby
		* have the phone process do the encoding). Moreover, CDMA now
		* has shared state (in the form of the msgId system property)
		* which can only be modified by the phone process, and hence
		* makes the output of these routines incorrect. Since they now
		* serve no purpose, they should probably just return null
		* directly, and be deprecated. Going further in that direction,
		* the above parsers of serialized pdu data should probably also
		* be gotten rid of, hiding all but the necessarily visible
		* structured data from client apps. A possible concern with
		* doing this is that apps may be using these routines to generate
		* pdus that are then sent elsewhere, some network server, for
		* example, and that always returning null would thereby break
		* otherwise useful apps.
		*/

		/**
		* Get an SMS-SUBMIT PDU for a destination address and a message
		*

telephony/java/com/android/internal/telephony/ISms.aidl

+43 −11

Original line number	Diff line number	Diff line
		@@ -67,24 +67,56 @@ interface ISms {
		boolean copyMessageToIccEf(int status, in byte[] pdu, in byte[] smsc);

		/**
		* Send a SMS
		* Send a data SMS.
		*
		* @param smsc the SMSC to send the message through, or NULL for the
		* default SMSC
		* @param pdu the raw PDU to send
		* @param sentIntent if not NULL this <code>Intent</code> is
		* broadcast when the message is successfully sent, or failed.
		* @param data the body of the message to send
		* @param sentIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is sucessfully sent, or failed.
		* The result code will be <code>Activity.RESULT_OK<code> for success,
		* or one of these errors:
		* <code>RESULT_ERROR_GENERIC_FAILURE</code>
		* <code>RESULT_ERROR_RADIO_OFF</code>
		* <code>RESULT_ERROR_NULL_PDU</code>.
		* @param deliveryIntent if not NULL this <code>Intent</code> is
		* or one of these errors:<br>
		* <code>RESULT_ERROR_GENERIC_FAILURE</code><br>
		* <code>RESULT_ERROR_RADIO_OFF</code><br>
		* <code>RESULT_ERROR_NULL_PDU</code><br>
		* For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include
		* the extra "errorCode" containing a radio technology specific value,
		* generally only useful for troubleshooting.<br>
		* The per-application based SMS control checks sentIntent. If sentIntent
		* is NULL the caller will be checked against all unknown applicaitons,
		* which cause smaller number of SMS to be sent in checking period.
		* @param deliveryIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		*/
		void sendData(in String destAddr, in String scAddr, in int destPort,
		in byte[] data, in PendingIntent sentIntent, in PendingIntent deliveryIntent);

		/**
		* Send an SMS.
		*
		* @param smsc the SMSC to send the message through, or NULL for the
		* default SMSC
		* @param text the body of the message to send
		* @param sentIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is sucessfully sent, or failed.
		* The result code will be <code>Activity.RESULT_OK<code> for success,
		* or one of these errors:<br>
		* <code>RESULT_ERROR_GENERIC_FAILURE</code><br>
		* <code>RESULT_ERROR_RADIO_OFF</code><br>
		* <code>RESULT_ERROR_NULL_PDU</code><br>
		* For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include
		* the extra "errorCode" containing a radio technology specific value,
		* generally only useful for troubleshooting.<br>
		* The per-application based SMS control checks sentIntent. If sentIntent
		* is NULL the caller will be checked against all unknown applications,
		* which cause smaller number of SMS to be sent in checking period.
		* @param deliveryIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		*/
		void sendRawPdu(in byte[] smsc, in byte[] pdu, in PendingIntent sentIntent,
		in PendingIntent deliveryIntent);
		void sendText(in String destAddr, in String scAddr, in String text,
		in PendingIntent sentIntent, in PendingIntent deliveryIntent);

		/**
		* Send a multi-part text based SMS.

telephony/java/com/android/internal/telephony/IccSmsInterfaceManager.java

+69 −26

Original line number	Diff line number	Diff line
		@@ -20,6 +20,8 @@ import android.app.PendingIntent;
		import android.content.Context;
		import android.util.Log;

		import com.android.internal.util.HexDump;

		import java.util.ArrayList;
		import java.util.List;

		@@ -49,40 +51,81 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		}

		/**
		* Send a Raw PDU SMS
		* Send a data based SMS to a specific application port.
		*
		* @param smsc the SMSC to send the message through, or NULL for the
		* defatult SMSC
		* @param pdu the raw PDU to send
		* @param sentIntent if not NULL this <code>Intent</code> is
		* @param destAddr the address to send the message to
		* @param scAddr is the service center address or null to use
		* the current default SMSC
		* @param destPort the port to deliver the message to
		* @param data the body of the message to send
		* @param sentIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is sucessfully sent, or failed.
		* The result code will be <code>Activity.RESULT_OK<code> for success,
		* or one of these errors:
		* <code>RESULT_ERROR_GENERIC_FAILURE</code>
		* <code>RESULT_ERROR_RADIO_OFF</code>
		* <code>RESULT_ERROR_NULL_PDU</code>.
		* @param deliveryIntent if not NULL this <code>Intent</code> is
		* or one of these errors:<br>
		* <code>RESULT_ERROR_GENERIC_FAILURE</code><br>
		* <code>RESULT_ERROR_RADIO_OFF</code><br>
		* <code>RESULT_ERROR_NULL_PDU</code><br>
		* For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include
		* the extra "errorCode" containing a radio technology specific value,
		* generally only useful for troubleshooting.<br>
		* The per-application based SMS control checks sentIntent. If sentIntent
		* is NULL the caller will be checked against all unknown applicaitons,
		* which cause smaller number of SMS to be sent in checking period.
		* @param deliveryIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		*/
		public void sendRawPdu(byte[] smsc, byte[] pdu, PendingIntent sentIntent,
		PendingIntent deliveryIntent) {
		Context context = mPhone.getContext();
		public void sendData(String destAddr, String scAddr, int destPort,
		byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		mPhone.getContext().enforceCallingPermission(
		"android.permission.SEND_SMS",
		"Sending SMS message");
		if (DBG) log("sendData: destAddr=" + destAddr + " scAddr=" + scAddr + " destPort=" +
		destPort + " data='"+ HexDump.toHexString(data) + "' sentIntent=" +
		sentIntent + " deliveryIntent=" + deliveryIntent);
		mDispatcher.sendData(destAddr, scAddr, destPort, data, sentIntent, deliveryIntent);
		}

		context.enforceCallingPermission(
		/**
		* Send a text based SMS.
		*
		* @param destAddr the address to send the message to
		* @param scAddr is the service center address or null to use
		* the current default SMSC
		* @param text the body of the message to send
		* @param sentIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is sucessfully sent, or failed.
		* The result code will be <code>Activity.RESULT_OK<code> for success,
		* or one of these errors:<br>
		* <code>RESULT_ERROR_GENERIC_FAILURE</code><br>
		* <code>RESULT_ERROR_RADIO_OFF</code><br>
		* <code>RESULT_ERROR_NULL_PDU</code><br>
		* For <code>RESULT_ERROR_GENERIC_FAILURE</code> the sentIntent may include
		* the extra "errorCode" containing a radio technology specific value,
		* generally only useful for troubleshooting.<br>
		* The per-application based SMS control checks sentIntent. If sentIntent
		* is NULL the caller will be checked against all unknown applications,
		* which cause smaller number of SMS to be sent in checking period.
		* @param deliveryIntent if not NULL this <code>PendingIntent</code> is
		* broadcast when the message is delivered to the recipient. The
		* raw pdu of the status report is in the extended data ("pdu").
		*/
		public void sendText(String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		mPhone.getContext().enforceCallingPermission(
		"android.permission.SEND_SMS",
		"Sending SMS message");
		if (DBG) log("sendRawPdu: smsc=" + smsc +
		" pdu="+ pdu + " sentIntent" + sentIntent +
		" deliveryIntent" + deliveryIntent);
		mDispatcher.sendRawPdu(smsc, pdu, sentIntent, deliveryIntent);
		if (DBG) log("sendText: destAddr=" + destAddr + " scAddr=" + scAddr +
		" text='"+ text + "' sentIntent=" +
		sentIntent + " deliveryIntent=" + deliveryIntent);
		mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent);
		}

		/**
		* Send a multi-part text based SMS.
		*
		* @param destinationAddress the address to send the message to
		* @param scAddress is the service center address or null to use
		* @param destAddr the address to send the message to
		* @param scAddr is the service center address or null to use
		* the current default SMSC
		* @param parts an <code>ArrayList</code> of strings that, in order,
		* comprise the original message
		@@ -94,21 +137,22 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		* <code>RESULT_ERROR_GENERIC_FAILURE</code>
		* <code>RESULT_ERROR_RADIO_OFF</code>
		* <code>RESULT_ERROR_NULL_PDU</code>.
		* The per-application based SMS control checks sentIntent. If sentIntent
		* is NULL the caller will be checked against all unknown applicaitons,
		* which cause smaller number of SMS to be sent in checking period.
		* @param deliveryIntents if not null, an <code>ArrayList</code> of
		* <code>PendingIntent</code>s (one for each message part) that is
		* broadcast when the corresponding message part has been delivered
		* to the recipient. The raw pdu of the status report is in the
		* extended data ("pdu").
		*/
		public void sendMultipartText(String destinationAddress, String scAddress, List<String> parts,
		public void sendMultipartText(String destAddr, String scAddr, List<String> parts,
		List<PendingIntent> sentIntents, List<PendingIntent> deliveryIntents) {
		Context context = mPhone.getContext();

		context.enforceCallingPermission(
		mPhone.getContext().enforceCallingPermission(
		"android.permission.SEND_SMS",
		"Sending SMS message");
		if (DBG) log("sendMultipartText");
		mDispatcher.sendMultipartText(destinationAddress, scAddress, (ArrayList<String>) parts,
		mDispatcher.sendMultipartText(destAddr, scAddr, (ArrayList<String>) parts,
		(ArrayList<PendingIntent>) sentIntents, (ArrayList<PendingIntent>) deliveryIntents);
		}

		@@ -163,4 +207,3 @@ public abstract class IccSmsInterfaceManager extends ISms.Stub {
		protected abstract void log(String msg);

		}

telephony/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -50,16 +50,21 @@ public class IccSmsInterfaceManagerProxy extends ISms.Stub {
		return mIccSmsInterfaceManager.getAllMessagesFromIccEf();
		}

		public void sendRawPdu(byte[] smsc, byte[] pdu, PendingIntent sentIntent,
		PendingIntent deliveryIntent) throws android.os.RemoteException {
		mIccSmsInterfaceManager.sendRawPdu(smsc, pdu, sentIntent,
		deliveryIntent);
		public void sendData(String destAddr, String scAddr, int destPort,
		byte[] data, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		mIccSmsInterfaceManager.sendData(destAddr, scAddr, destPort, data,
		sentIntent, deliveryIntent);
		}

		public void sendMultipartText(String destinationAddress, String scAddress,
		public void sendText(String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent) {
		mIccSmsInterfaceManager.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent);
		}

		public void sendMultipartText(String destAddr, String scAddr,
		List<String> parts, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents) throws android.os.RemoteException {
		mIccSmsInterfaceManager.sendMultipartText(destinationAddress, scAddress,
		mIccSmsInterfaceManager.sendMultipartText(destAddr, scAddr,
		parts, sentIntents, deliveryIntents);
		}