summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNan Wu <wnan@google.com>2022-03-18 15:42:46 +0000
committerNan Wu <wnan@google.com>2022-03-18 20:33:24 +0000
commit325458ce538b49dea1a284775e0dc1e7376dfbcc (patch)
tree0d2375336ed97ce1821243217e004e99c7e38c7e
parentf32345450545f1ed57e4c633d321adadcba401cf (diff)
downloadMms-325458ce538b49dea1a284775e0dc1e7376dfbcc.tar.gz
Add attribution tag to MMS Service
Added additional parameter attribution tag to the overriding methods sendMessage and downloadMessage just to pass compilation. The parameter is not actually used in the class. Bug: 224831002 Test: Manually verify send/receive multimedia messages. Change-Id: Id361a822170e175e96b43827a3db2932595c1c17
-rw-r--r--src/com/android/mms/service/MmsService.java6
-rw-r--r--tests/robotests/src/com/android/mms/service/MmsServiceRoboTest.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/mms/service/MmsService.java b/src/com/android/mms/service/MmsService.java
index c752120..d227b3c 100644
--- a/src/com/android/mms/service/MmsService.java
+++ b/src/com/android/mms/service/MmsService.java
@@ -207,7 +207,7 @@ public class MmsService extends Service implements MmsRequest.RequestManager {
@Override
public void sendMessage(int subId, String callingPkg, Uri contentUri,
String locationUrl, Bundle configOverrides, PendingIntent sentIntent,
- long messageId) {
+ long messageId, String attributionTag) {
LogUtil.d("sendMessage " + formatCrossStackMessageId(messageId));
enforceSystemUid();
@@ -278,8 +278,8 @@ public class MmsService extends Service implements MmsRequest.RequestManager {
@Override
public void downloadMessage(int subId, String callingPkg, String locationUrl,
- Uri contentUri, Bundle configOverrides,
- PendingIntent downloadedIntent, long messageId) {
+ Uri contentUri, Bundle configOverrides, PendingIntent downloadedIntent,
+ long messageId, String attributionTag) {
// If the subId is no longer active it could be caused by an MVNO using multiple
// subIds, so we should try to download anyway.
// TODO: Fail fast when downloading will fail (i.e. SIM swapped)
diff --git a/tests/robotests/src/com/android/mms/service/MmsServiceRoboTest.java b/tests/robotests/src/com/android/mms/service/MmsServiceRoboTest.java
index c43fa74..b59e92e 100644
--- a/tests/robotests/src/com/android/mms/service/MmsServiceRoboTest.java
+++ b/tests/robotests/src/com/android/mms/service/MmsServiceRoboTest.java
@@ -57,7 +57,7 @@ public final class MmsServiceRoboTest {
ShadowBinder.setCallingUid(Process.SYSTEM_UID);
binder.sendMessage(/* subId= */ 0, "callingPkg", Uri.parse("contentUri"),
"locationUrl", /* configOverrides= */ null, /* sentIntent= */ null,
- /* messageId= */ 0L);
+ /* messageId= */ 0L, /* attributionTag= */ null);
}
@Test
@@ -65,6 +65,6 @@ public final class MmsServiceRoboTest {
assertThrows(SecurityException.class,
() -> binder.sendMessage(/* subId= */ 0, "callingPkg", Uri.parse("contentUri"),
"locationUrl", /* configOverrides= */ null, /* sentIntent= */ null,
- /* messageId= */ 0L));
+ /* messageId= */ 0L, /* attributionTag= */ null));
}
}