Telephony(MSIM): Set priority when send sms (7c5e851d) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/MSimSmsManager.java

+57 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,63 @@ public class MSimSmsManager {
		}
		}

		/**
		* Send a text based SMS.
		*
		* @param destinationAddress the address to send the message to
		* @param scAddress 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 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").
		* @param priority Priority level of the message
		* @param subscription on which the SMS has to be sent.
		*
		* @throws IllegalArgumentException if destinationAddress or text are empty
		*
		* {@hide}
		*/
		public void sendTextMessageWithPriority(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent,
		int priority, int subscription) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}

		if (TextUtils.isEmpty(text)) {
		throw new IllegalArgumentException("Invalid message body");
		}

		if (priority < 0 \|\| priority > 3) {
		throw new IllegalArgumentException("Invalid priority");
		}

		try {
		ISmsMSim iccISms = ISmsMSim.Stub.asInterface(ServiceManager.getService("isms_msim"));
		if (iccISms != null) {
		iccISms.sendTextWithPriority(destinationAddress, scAddress, text, sentIntent,
		deliveryIntent, subscription, priority);
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		}

		/**
		* Divide a message text into several fragments, none bigger than
		* the maximum SMS message size.

src/java/android/telephony/SmsManager.java

+54 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,60 @@ public final class SmsManager {
		}
		}

		/**
		* Send a text based SMS.
		*
		* @param destinationAddress the address to send the message to
		* @param scAddress 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 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").
		* @param priority Priority level of the message
		*
		* @throws IllegalArgumentException if destinationAddress or text are empty
		* {@hide}
		*/
		public void sendTextMessageWithPriority(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}

		if (TextUtils.isEmpty(text)) {
		throw new IllegalArgumentException("Invalid message body");
		}

		if (priority < 0 \|\| priority > 3) {
		throw new IllegalArgumentException("Invalid priority");
		}

		try {
		ISms iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
		if (iccISms != null) {
		iccISms.sendTextWithPriority(destinationAddress, scAddress, text, sentIntent,
		deliveryIntent, priority);
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		}

		/**
		* Divide a message text into several fragments, none bigger than
		* the maximum SMS message size.

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

+39 −0

Original line number	Diff line number	Diff line
		@@ -439,6 +439,45 @@ public class IccSmsInterfaceManager extends ISms.Stub {
		mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent);
		}

		/**
		* 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 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").
		* @param priority Priority level of the message
		*/
		public void sendTextWithPriority(String destAddr, String scAddr, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority) {
		mPhone.getContext().enforceCallingPermission(
		"android.permission.SEND_SMS",
		"Sending SMS message");
		if (Log.isLoggable("SMS", Log.VERBOSE)) {
		log("sendText: destAddr=" + destAddr + " scAddr=" + scAddr +
		" text='" + text + "' sentIntent=" +
		sentIntent + " deliveryIntent=" + deliveryIntent);
		}
		mDispatcher.sendTextWithPriority(destAddr, scAddr, text, sentIntent, deliveryIntent,
		priority);
		}

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

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,18 @@ public class ImsSMSDispatcher extends SMSDispatcher {
		}
		}

		@Override
		protected void sendTextWithPriority(String destAddr, String scAddr, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority) {
		Rlog.d(TAG, "sendTextWithPriority");
		if (isCdmaMo()) {
		mCdmaDispatcher.sendTextWithPriority(destAddr, scAddr,
		text, sentIntent, deliveryIntent, priority);
		} else {
		Rlog.e(TAG, "priority is not supported in 3gpp text message!");
		}
		}

		@Override
		public void sendRetrySms(SmsTracker tracker) {
		String oldFormat = tracker.mFormat;

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

+29 −0

Original line number	Diff line number	Diff line
		@@ -878,6 +878,35 @@ public abstract class SMSDispatcher extends Handler {
		protected abstract void sendText(String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent);

		/**
		* 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 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>
		* <code>RESULT_ERROR_NO_SERVICE</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").
		* @param priority Priority level of the message
		*/
		protected abstract void sendTextWithPriority(String destAddr, String scAddr, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority);

		/**
		* Calculate the number of septets needed to encode the message.
		*