commit 325458ce538b49dea1a284775e0dc1e7376dfbcc
author Nan Wu <wnan@google.com> Fri Mar 18 15:42:46 2022 +0000
committer Nan Wu <wnan@google.com> Fri Mar 18 20:33:24 2022 +0000
tree 0d2375336ed97ce1821243217e004e99c7e38c7e
parent f32345450545f1ed57e4c633d321adadcba401cf

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

src/com/android/mms/service/MmsService.java

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 @@
         @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 @@
 
         @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)

tests/robotests/src/com/android/mms/service/MmsServiceRoboTest.java

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 @@
         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 @@
         assertThrows(SecurityException.class,
                 () -> binder.sendMessage(/* subId= */ 0, "callingPkg", Uri.parse("contentUri"),
                         "locationUrl", /* configOverrides= */ null, /* sentIntent= */ null,
-                        /* messageId= */ 0L));
+                        /* messageId= */ 0L, /* attributionTag= */ null));
     }
 }