summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Thomas Nguyen <tnd@google.com> 2023-08-24 18:15:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-24 18:15:48 +0000
commit2a18bacab8a25e6ea722082c1902aa5e762f5c45 (patch)
tree478dfd3a8101e90c9517a69e4be0d63b3493b1a4
parent8295d1c75dae0a24b02b12410940716446ea5e05 (diff)
parenta1bf6ae4ca2e83b94bc807f5e673c33d164cda86 (diff)
Merge "Provide attribution tag when sending text message" into main
-rw-r--r--telephony/java/android/telephony/SmsManager.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java
index 145cc2c78ed9..3991bb20e477 100644
--- a/telephony/java/android/telephony/SmsManager.java
+++ b/telephony/java/android/telephony/SmsManager.java
@@ -842,7 +842,7 @@ public final class SmsManager {
ISms iSms = getISmsServiceOrThrow();
if (iSms != null) {
iSms.sendTextForSubscriberWithOptions(subId,
- null, null, destinationAddress,
+ null, getAttributionTag(), destinationAddress,
scAddress,
text, sentIntent, deliveryIntent, persistMessage, finalPriority,
expectMore, finalValidity);
@@ -864,7 +864,7 @@ public final class SmsManager {
ISms iSms = getISmsServiceOrThrow();
if (iSms != null) {
iSms.sendTextForSubscriberWithOptions(getSubscriptionId(),
- null, null, destinationAddress,
+ null, getAttributionTag(), destinationAddress,
scAddress,
text, sentIntent, deliveryIntent, persistMessage, finalPriority,
expectMore, finalValidity);
@@ -1513,8 +1513,8 @@ public final class SmsManager {
public void onSuccess(int subId) {
try {
ISms iSms = getISmsServiceOrThrow();
- iSms.sendDataForSubscriber(subId, null, null, destinationAddress, scAddress,
- destinationPort & 0xFFFF, data, sentIntent, deliveryIntent);
+ iSms.sendDataForSubscriber(subId, null, getAttributionTag(), destinationAddress,
+ scAddress, destinationPort & 0xFFFF, data, sentIntent, deliveryIntent);
} catch (RemoteException e) {
Log.e(TAG, "sendDataMessage: Couldn't send SMS - Exception: " + e.getMessage());
notifySmsError(sentIntent, RESULT_REMOTE_EXCEPTION);