Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1... (7fd121e1) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SmsManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -697,7 +697,7 @@ public final class SmsManager {
		ISms iSms = getISmsServiceOrThrow();
		if (iSms != null) {
		iSms.sendTextForSubscriberWithOptions(subId,
		null, destinationAddress,
		null, null, destinationAddress,
		scAddress,
		text, sentIntent, deliveryIntent, persistMessage, finalPriority,
		expectMore, finalValidity);
		@@ -719,7 +719,7 @@ public final class SmsManager {
		ISms iSms = getISmsServiceOrThrow();
		if (iSms != null) {
		iSms.sendTextForSubscriberWithOptions(getSubscriptionId(),
		null, destinationAddress,
		null, null, destinationAddress,
		scAddress,
		text, sentIntent, deliveryIntent, persistMessage, finalPriority,
		expectMore, finalValidity);

telephony/java/android/telephony/TelephonyManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -4923,7 +4923,7 @@ public class TelephonyManager {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		telephony.sendVisualVoicemailSmsForSubscriber(
		mContext.getOpPackageName(), subId, number, port, text, sentIntent);
		mContext.getOpPackageName(), null, subId, number, port, text, sentIntent);
		}
		} catch (RemoteException ex) {
		}

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

+5 −60

Original line number	Diff line number	Diff line
		@@ -90,34 +90,6 @@ interface ISms {
		in String scAddr, in int destPort, in byte[] data, in PendingIntent sentIntent,
		in PendingIntent deliveryIntent);

		/**
		* Send a data SMS. Only for use internally.
		*
		* @param smsc the SMSC to send the message through, or NULL for the
		* default SMSC
		* @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:<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").
		* @param subId the subId id.
		*/
		void sendDataForSubscriberWithSelfPermissions(int subId, String callingPkg, in String destAddr,
		in String scAddr, in int destPort, in byte[] data, in PendingIntent sentIntent,
		in PendingIntent deliveryIntent);

		/**
		* Send an SMS.
		*
		@@ -153,34 +125,6 @@ interface ISms {
		in PendingIntent deliveryIntent, in boolean persistMessageForNonDefaultSmsApp,
		in long messageId);

		/**
		* Send an SMS. Internal use only.
		*
		* @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").
		* @param subId the subId on which the SMS has to be sent.
		*/
		void sendTextForSubscriberWithSelfPermissions(in int subId, String callingPkg,
		in String destAddr, in String scAddr, in String text, in PendingIntent sentIntent,
		in PendingIntent deliveryIntent, in boolean persistMessage);

		/**
		* Send an SMS with options using Subscription Id.
		*
		@@ -227,10 +171,11 @@ interface ISms {
		* Validity Period(Maximum) -> 635040 mins(i.e.63 weeks).
		* Any Other values included Negative considered as Invalid Validity Period of the message.
		*/
		void sendTextForSubscriberWithOptions(in int subId, String callingPkg, in String destAddr,
		in String scAddr, in String text, in PendingIntent sentIntent,
		in PendingIntent deliveryIntent, in boolean persistMessageForNonDefaultSmsApp,
		in int priority, in boolean expectMore, in int validityPeriod);
		void sendTextForSubscriberWithOptions(in int subId, String callingPkg,
		String callingAttributionTag, in String destAddr, in String scAddr, in String text,
		in PendingIntent sentIntent, in PendingIntent deliveryIntent,
		in boolean persistMessageForNonDefaultSmsApp, in int priority, in boolean expectMore,
		in int validityPeriod);

		/**
		* Inject an SMS PDU into the android platform.

telephony/java/com/android/internal/telephony/ISmsImplBase.java

+5 −18

Original line number	Diff line number	Diff line
		@@ -51,13 +51,6 @@ public class ISmsImplBase extends ISms.Stub {
		throw new UnsupportedOperationException();
		}

		@Override
		public void sendDataForSubscriberWithSelfPermissions(int subId, String callingPkg,
		String destAddr, String scAddr, int destPort, byte[] data, PendingIntent sentIntent,
		PendingIntent deliveryIntent) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void sendTextForSubscriber(int subId, String callingPkg, String destAddr,
		String scAddr, String text, PendingIntent sentIntent,
		@@ -67,17 +60,11 @@ public class ISmsImplBase extends ISms.Stub {
		}

		@Override
		public void sendTextForSubscriberWithSelfPermissions(int subId, String callingPkg,
		String destAddr, String scAddr, String text, PendingIntent sentIntent,
		PendingIntent deliveryIntent, boolean persistMessage) {
		throw new UnsupportedOperationException();
		}

		@Override
		public void sendTextForSubscriberWithOptions(int subId, String callingPkg, String destAddr,
		String scAddr, String text, PendingIntent sentIntent,
		PendingIntent deliveryIntent, boolean persistMessageForNonDefaultSmsApp,
		int priority, boolean expectMore, int validityPeriod) {
		public void sendTextForSubscriberWithOptions(int subId, String callingPkg,
		String callingAttributionTag, String destAddr, String scAddr, String text,
		PendingIntent sentIntent, PendingIntent deliveryIntent,
		boolean persistMessageForNonDefaultSmsApp, int priority, boolean expectMore,
		int validityPeriod) {
		throw new UnsupportedOperationException();
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -473,8 +473,8 @@ interface ITelephony {
		* Send a visual voicemail SMS. Internal use only.
		* Requires caller to be the default dialer and have SEND_SMS permission
		*/
		void sendVisualVoicemailSmsForSubscriber(in String callingPackage, in int subId,
		in String number, in int port, in String text, in PendingIntent sentIntent);
		void sendVisualVoicemailSmsForSubscriber(in String callingPackage, String callingAttributeTag,
		in int subId, in String number, in int port, in String text, in PendingIntent sentIntent);

		// Send the special dialer code. The IPC caller must be the current default dialer.
		void sendDialerSpecialCode(String callingPackageName, String inputCode);