From f35af1fc36dd081447ed87aa1922fe6515eb4b55 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Thu, 19 Mar 2020 21:37:01 +0000 Subject: [PATCH] Merge "Pipe through attributeTag for one self-permission check" am: 9ed7e7f1b1 am: 1bf1d39fa4 am: 6094f4258e am: 7fd121e139 am: b54512bca9 Bug: 136595429 Change-Id: I60bc87fac0070e6d3a749ae5fc8346d9f4f55da8 (cherry picked from commit 24b15eef74230945dffe721c19b96e071e4b95ff) --- .../java/android/telephony/SmsManager.java | 4 +- .../android/telephony/TelephonyManager.java | 2 +- .../com/android/internal/telephony/ISms.aidl | 65 ++----------------- .../internal/telephony/ISmsImplBase.java | 23 ++----- .../internal/telephony/ITelephony.aidl | 4 +- 5 files changed, 15 insertions(+), 83 deletions(-) diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java index 6aea5eeca3fd7..cc8cef3b3faa6 100644 --- a/telephony/java/android/telephony/SmsManager.java +++ b/telephony/java/android/telephony/SmsManager.java @@ -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); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index d6f5bb2577ab3..afe197b877718 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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) { } diff --git a/telephony/java/com/android/internal/telephony/ISms.aidl b/telephony/java/com/android/internal/telephony/ISms.aidl index 79cdce8cba46b..fed969d4948f0 100644 --- a/telephony/java/com/android/internal/telephony/ISms.aidl +++ b/telephony/java/com/android/internal/telephony/ISms.aidl @@ -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 PendingIntent is - * broadcast when the message is sucessfully sent, or failed. - * The result code will be Activity.RESULT_OK for success, - * or one of these errors:
- * RESULT_ERROR_GENERIC_FAILURE
- * RESULT_ERROR_RADIO_OFF
- * RESULT_ERROR_NULL_PDU
- * For RESULT_ERROR_GENERIC_FAILURE the sentIntent may include - * the extra "errorCode" containing a radio technology specific value, - * generally only useful for troubleshooting.
- * 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 PendingIntent 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 PendingIntent is - * broadcast when the message is sucessfully sent, or failed. - * The result code will be Activity.RESULT_OK for success, - * or one of these errors:
- * RESULT_ERROR_GENERIC_FAILURE
- * RESULT_ERROR_RADIO_OFF
- * RESULT_ERROR_NULL_PDU
- * For RESULT_ERROR_GENERIC_FAILURE the sentIntent may include - * the extra "errorCode" containing a radio technology specific value, - * generally only useful for troubleshooting.
- * 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 PendingIntent 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. diff --git a/telephony/java/com/android/internal/telephony/ISmsImplBase.java b/telephony/java/com/android/internal/telephony/ISmsImplBase.java index db0b8e528c87e..67ad23a664fab 100644 --- a/telephony/java/com/android/internal/telephony/ISmsImplBase.java +++ b/telephony/java/com/android/internal/telephony/ISmsImplBase.java @@ -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(); } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index dcf339c1be2fe..81c0895c76c07 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -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);