1 files changed, 13 insertions, 5 deletions

diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/actions/RegisterSource.java b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/actions/RegisterSource.java
index 4c17b47f4a..c81a9571d3 100644
--- a/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/actions/RegisterSource.java
+++ b/adservices/tests/unittest/service-core/src/com/android/adservices/service/measurement/actions/RegisterSource.java
@@ -36,21 +36,22 @@ public final class RegisterSource implements Action {
     public final RegistrationRequest mRegistrationRequest;
     public final Map<String, List<Map<String, List<String>>>> mUriToResponseHeadersMap;
     public final long mTimestamp;
+    // Used in interop tests
+    public final String mPublisher;
 
     public RegisterSource(JSONObject obj) throws JSONException {
         JSONObject regParamsJson = obj.getJSONObject(
                 TestFormatJsonMapping.REGISTRATION_REQUEST_KEY);
 
         AttributionSource attributionSource = getAttributionSource(
-                regParamsJson.optString(TestFormatJsonMapping.ATTRIBUTION_SOURCE_KEY));
+                regParamsJson.optString(TestFormatJsonMapping.ATTRIBUTION_SOURCE_KEY,
+                        TestFormatJsonMapping.ATTRIBUTION_SOURCE_DEFAULT));
+
+        mPublisher = regParamsJson.optString(TestFormatJsonMapping.SOURCE_TOP_ORIGIN_URI_KEY);
 
         mRegistrationRequest =
                 new RegistrationRequest.Builder()
                         .setRegistrationType(RegistrationRequest.REGISTER_SOURCE)
-                        .setTopOriginUri(
-                                Uri.parse(
-                                        regParamsJson.getString(
-                                                TestFormatJsonMapping.SOURCE_TOP_ORIGIN_URI_KEY)))
                         .setRegistrationUri(
                                 Uri.parse(
                                         regParamsJson.getString(
@@ -61,6 +62,9 @@ public final class RegisterSource implements Action {
                                                 .equals(TestFormatJsonMapping.SOURCE_VIEW_TYPE)
                                         ? null
                                         : getInputEvent())
+                        .setAdIdPermissionGranted(
+                                regParamsJson.optBoolean(
+                                        TestFormatJsonMapping.IS_ADID_PERMISSION_GRANTED_KEY, true))
                         .setPackageName(attributionSource.getPackageName())
                         .build();
         mUriToResponseHeadersMap = getUriToResponseHeadersMap(obj);
@@ -71,4 +75,8 @@ public final class RegisterSource implements Action {
     public long getComparable() {
         return mTimestamp;
     }
+
+    public String getPublisher() {
+        return mPublisher;
+    }
 }