Message priority support for 3gpp2 (b835c26c) · Commits · e / os / android_frameworks_opt_telephony

src/java/android/telephony/MSimSmsManager.java

+76 −10

Original line number	Diff line number	Diff line
		@@ -133,10 +133,10 @@ public class MSimSmsManager {
		*
		* {@hide}
		*/
		public void sendTextMessageWithPriority(
		public void sendTextMessage(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent,
		int priority, int subscription) {
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority,
		int subscription) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		@@ -145,16 +145,12 @@ public class MSimSmsManager {
		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(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, text, sentIntent, deliveryIntent, subscription,
		priority);
		iccISms.sendTextWithOptions(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, text, sentIntent, deliveryIntent,
		priority, subscription);
		}
		} catch (RemoteException ex) {
		// ignore it
		@@ -247,6 +243,76 @@ public class MSimSmsManager {
		}
		}

		/**
		* Send a multi-part text based SMS. The callee should have already
		* divided the message into correctly sized parts by calling
		* <code>divideMessage</code>.
		*
		* @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 parts an <code>ArrayList</code> of strings that, in order,
		* comprise the original message
		* @param sentIntents 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 sent.
		* 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> each 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 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").
		* @param priority Priority level of the message
		* @param subscription on which the SMS has to be sent.
		*
		* @throws IllegalArgumentException if destinationAddress or data are empty
		*/
		public void sendMultipartTextMessage(String destinationAddress, String scAddress,
		ArrayList<String> parts, ArrayList<PendingIntent> sentIntents,
		ArrayList<PendingIntent> deliveryIntents, int priority, int subscription) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		if (parts == null \|\| parts.size() < 1) {
		throw new IllegalArgumentException("Invalid message body");
		}

		if (parts.size() > 1) {
		try {
		ISmsMSim iccISms = ISmsMSim.Stub.asInterface(
		ServiceManager.getService("isms_msim"));
		if (iccISms != null) {
		iccISms.sendMultipartTextWithOptions(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, parts, sentIntents, deliveryIntents,
		priority, subscription);
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		} else {
		PendingIntent sentIntent = null;
		PendingIntent deliveryIntent = null;
		if (sentIntents != null && sentIntents.size() > 0) {
		sentIntent = sentIntents.get(0);
		}
		if (deliveryIntents != null && deliveryIntents.size() > 0) {
		deliveryIntent = deliveryIntents.get(0);
		}
		sendTextMessage(destinationAddress, scAddress, parts.get(0),
		sentIntent, deliveryIntent, priority, subscription);
		}
		}

		/**
		* Send a data based SMS to a specific application port.
		*

src/java/android/telephony/SmsManager.java

+93 −7

Original line number	Diff line number	Diff line
		@@ -111,6 +111,16 @@ public final class SmsManager {
		/**
		* Send a text based SMS.
		*
		* <p class="note"><strong>Note:</strong> Using this method requires that your app has the
		* {@link android.Manifest.permission#SEND_SMS} permission.</p>
		*
		* <p class="note"><strong>Note:</strong> Beginning with Android 4.4 (API level 19), if
		* <em>and only if</em> an app is not selected as the default SMS app, the system automatically
		* writes messages sent using this method to the SMS Provider (the default SMS app is always
		* responsible for writing its sent messages to the SMS Provider). For information about
		* how to behave as the default SMS app, see {@link android.provider.Telephony}.</p>
		*
		*
		* @param destinationAddress the address to send the message to
		* @param scAddress is the service center address or null to use
		* the current default SMSC
		@@ -136,7 +146,7 @@ public final class SmsManager {
		* @throws IllegalArgumentException if destinationAddress or text are empty
		* {@hide}
		*/
		public void sendTextMessageWithPriority(
		public void sendTextMessage(
		String destinationAddress, String scAddress, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority) {
		if (TextUtils.isEmpty(destinationAddress)) {
		@@ -147,15 +157,12 @@ public final class SmsManager {
		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(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, text, sentIntent, deliveryIntent, priority);
		iccISms.sendTextWithOptions(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, text, sentIntent, deliveryIntent,
		priority);
		}
		} catch (RemoteException ex) {
		// ignore it
		@@ -255,6 +262,85 @@ public final class SmsManager {
		}
		}

		/**
		* Send a multi-part text based SMS. The callee should have already
		* divided the message into correctly sized parts by calling
		* <code>divideMessage</code>.
		*
		* <p class="note"><strong>Note:</strong> Using this method requires that your app has the
		* {@link android.Manifest.permission#SEND_SMS} permission.</p>
		*
		* <p class="note"><strong>Note:</strong> Beginning with Android 4.4 (API level 19), if
		* <em>and only if</em> an app is not selected as the default SMS app, the system automatically
		* writes messages sent using this method to the SMS Provider (the default SMS app is always
		* responsible for writing its sent messages to the SMS Provider). For information about
		* how to behave as the default SMS app, see {@link android.provider.Telephony}.</p>
		*
		* @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 parts an <code>ArrayList</code> of strings that, in order,
		* comprise the original message
		* @param sentIntents 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 sent.
		* 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> each 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 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").
		* @param priority Priority level of the message
		*
		* @throws IllegalArgumentException if destinationAddress or data are empty
		* {@hide}
		*/
		public void sendMultipartTextMessage(
		String destinationAddress, String scAddress, ArrayList<String> parts,
		ArrayList<PendingIntent> sentIntents, ArrayList<PendingIntent> deliveryIntents,
		int priority) {
		if (TextUtils.isEmpty(destinationAddress)) {
		throw new IllegalArgumentException("Invalid destinationAddress");
		}
		if (parts == null \|\| parts.size() < 1) {
		throw new IllegalArgumentException("Invalid message body");
		}

		if (parts.size() > 1) {
		try {
		ISms iccISms = ISms.Stub.asInterface(ServiceManager.getService("isms"));
		if (iccISms != null) {
		iccISms.sendMultipartTextWithOptions(ActivityThread.currentPackageName(),
		destinationAddress, scAddress, parts,
		sentIntents, deliveryIntents, priority);
		}
		} catch (RemoteException ex) {
		// ignore it
		}
		} else {
		PendingIntent sentIntent = null;
		PendingIntent deliveryIntent = null;
		if (sentIntents != null && sentIntents.size() > 0) {
		sentIntent = sentIntents.get(0);
		}
		if (deliveryIntents != null && deliveryIntents.size() > 0) {
		deliveryIntent = deliveryIntents.get(0);
		}
		sendTextMessage(destinationAddress, scAddress, parts.get(0),
		sentIntent, deliveryIntent, priority);
		}
		}

		/**
		* Send a data based SMS to a specific application port.
		*

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

+60 −9

Original line number	Diff line number	Diff line
		@@ -397,11 +397,11 @@ public class IccSmsInterfaceManager extends ISms.Stub {
		callingPackage) != AppOpsManager.MODE_ALLOWED) {
		return;
		}
		mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent);
		mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent, -1);
		}

		/**
		* Send a text based SMS with priority.
		* 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
		@@ -425,22 +425,23 @@ public class IccSmsInterfaceManager extends ISms.Stub {
		* raw pdu of the status report is in the extended data ("pdu").
		* @param priority Priority level of the message
		*/
		public void sendTextWithPriority(String callingPackage, String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent, int priority) {
		@Override
		public void sendTextWithOptions(String callingPackage, String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent,
		int priority) {
		mPhone.getContext().enforceCallingPermission(
		Manifest.permission.SEND_SMS,
		"Sending SMS message");
		if (Rlog.isLoggable("SMS", Log.VERBOSE)) {
		log("sendTextWithPriority: destAddr=" + destAddr + " scAddr=" + scAddr +
		log("sendText: destAddr=" + destAddr + " scAddr=" + scAddr +
		" text='"+ text + "' sentIntent=" +
		sentIntent + " deliveryIntent=" + deliveryIntent + " priority="+priority);
		sentIntent + " deliveryIntent=" + deliveryIntent);
		}
		if (mAppOps.noteOp(AppOpsManager.OP_SEND_SMS, Binder.getCallingUid(),
		callingPackage) != AppOpsManager.MODE_ALLOWED) {
		return;
		}
		mDispatcher.sendTextWithPriority(destAddr, scAddr, text, sentIntent, deliveryIntent,
		priority);
		mDispatcher.sendText(destAddr, scAddr, text, sentIntent, deliveryIntent, priority);
		}

		/**
		@@ -487,7 +488,57 @@ public class IccSmsInterfaceManager extends ISms.Stub {
		return;
		}
		mDispatcher.sendMultipartText(destAddr, scAddr, (ArrayList<String>) parts,
		(ArrayList<PendingIntent>) sentIntents, (ArrayList<PendingIntent>) deliveryIntents);
		(ArrayList<PendingIntent>) sentIntents, (ArrayList<PendingIntent>) deliveryIntents,
		-1);
		}

		/**
		* Send a multi-part 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 parts an <code>ArrayList</code> of strings that, in order,
		* comprise the original message
		* @param sentIntents 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 sent.
		* 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>.
		* 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 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").
		* @param priority Priority level of the message
		*/
		@Override
		public void sendMultipartTextWithOptions(String callingPackage, String destAddr,
		String scAddr, List<String> parts, List<PendingIntent> sentIntents,
		List<PendingIntent> deliveryIntents, int priority) {
		mPhone.getContext().enforceCallingPermission(
		Manifest.permission.SEND_SMS,
		"Sending SMS message");
		if (Rlog.isLoggable("SMS", Log.VERBOSE)) {
		int i = 0;
		for (String part : parts) {
		log("sendMultipartText: destAddr=" + destAddr + ", srAddr=" + scAddr +
		", part[" + (i++) + "]=" + part);
		}
		}
		if (mAppOps.noteOp(AppOpsManager.OP_SEND_SMS, Binder.getCallingUid(),
		callingPackage) != AppOpsManager.MODE_ALLOWED) {
		return;
		}
		mDispatcher.sendMultipartText(destAddr, scAddr, (ArrayList<String>) parts,
		(ArrayList<PendingIntent>) sentIntents, (ArrayList<PendingIntent>) deliveryIntents,
		priority);
		}

		@Override

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

+6 −18

Original line number	Diff line number	Diff line
		@@ -187,13 +187,13 @@ public class ImsSMSDispatcher extends SMSDispatcher {
		@Override
		protected void sendMultipartText(String destAddr, String scAddr,
		ArrayList<String> parts, ArrayList<PendingIntent> sentIntents,
		ArrayList<PendingIntent> deliveryIntents) {
		ArrayList<PendingIntent> deliveryIntents, int priority) {
		if (isCdmaMo()) {
		mCdmaDispatcher.sendMultipartText(destAddr, scAddr,
		parts, sentIntents, deliveryIntents);
		parts, sentIntents, deliveryIntents, priority);
		} else {
		mGsmDispatcher.sendMultipartText(destAddr, scAddr,
		parts, sentIntents, deliveryIntents);
		parts, sentIntents, deliveryIntents, priority);
		}
		}

		@@ -206,26 +206,14 @@ public class ImsSMSDispatcher extends SMSDispatcher {

		@Override
		protected void sendText(String destAddr, String scAddr, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent) {
		PendingIntent sentIntent, PendingIntent deliveryIntent, int priority) {
		Rlog.d(TAG, "sendText");
		if (isCdmaMo()) {
		mCdmaDispatcher.sendText(destAddr, scAddr,
		text, sentIntent, deliveryIntent);
		text, sentIntent, deliveryIntent, priority);
		} else {
		mGsmDispatcher.sendText(destAddr, scAddr,
		text, sentIntent, deliveryIntent);
		}
		}

		@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!");
		}
		}

		@@ -336,7 +324,7 @@ public class ImsSMSDispatcher extends SMSDispatcher {
		@Override
		protected void sendNewSubmitPdu(String destinationAddress, String scAddress, String message,
		SmsHeader smsHeader, int format, PendingIntent sentIntent,
		PendingIntent deliveryIntent, boolean lastPart) {
		PendingIntent deliveryIntent, boolean lastPart, int priority) {
		Rlog.e(TAG, "Error! Not implemented for IMS.");
		}

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

+9 −34

Original line number	Diff line number	Diff line
		@@ -488,34 +488,6 @@ public abstract class SMSDispatcher extends Handler {
		protected abstract void sendData(String destAddr, String scAddr, int destPort,
		byte[] data, 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").
		*/
		protected abstract void sendText(String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent);

		/**
		* Send a text based SMS.
		*
		@@ -542,8 +514,9 @@ public abstract class SMSDispatcher extends Handler {
		* 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);
		protected abstract void sendText(String destAddr, String scAddr,
		String text, PendingIntent sentIntent, PendingIntent deliveryIntent,
		int priority);

		/**
		* Calculate the number of septets needed to encode the message.
		@@ -580,10 +553,11 @@ public abstract class SMSDispatcher extends Handler {
		* 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").
		* @param priority Priority level of the message
		*/
		protected void sendMultipartText(String destAddr, String scAddr,
		ArrayList<String> parts, ArrayList<PendingIntent> sentIntents,
		ArrayList<PendingIntent> deliveryIntents) {
		ArrayList<PendingIntent> deliveryIntents, int priority) {

		int refNumber = getNextConcatenatedRef() & 0x00FF;
		int msgCount = parts.size();
		@@ -634,7 +608,7 @@ public abstract class SMSDispatcher extends Handler {
		}

		sendNewSubmitPdu(destAddr, scAddr, parts.get(i), smsHeader, encoding,
		sentIntent, deliveryIntent, (i == (msgCount - 1)));
		sentIntent, deliveryIntent, (i == (msgCount - 1)), priority);
		}

		}
		@@ -644,7 +618,8 @@ public abstract class SMSDispatcher extends Handler {
		*/
		protected abstract void sendNewSubmitPdu(String destinationAddress, String scAddress,
		String message, SmsHeader smsHeader, int encoding,
		PendingIntent sentIntent, PendingIntent deliveryIntent, boolean lastPart);
		PendingIntent sentIntent, PendingIntent deliveryIntent, boolean lastPart,
		int priority);

		/**
		* Send a SMS
		@@ -1022,7 +997,7 @@ public abstract class SMSDispatcher extends Handler {
		return;
		}

		sendMultipartText(destinationAddress, scAddress, parts, sentIntents, deliveryIntents);
		sendMultipartText(destinationAddress, scAddress, parts, sentIntents, deliveryIntents, -1);
		}

		/**