Snap for 9056327 from 0d176f7d6b94234f49a18de8d721e160a085e4ee to mainline-ipsec-releaseaml_ips_331111030

Change-Id: I53eb25530fd1c87495ef83c45f76a114aa73d9ed

1 files changed, 13 insertions, 0 deletions

diff --git a/adservices/tests/unittest/service-core/src/com/android/adservices/data/measurement/DbState.java b/adservices/tests/unittest/service-core/src/com/android/adservices/data/measurement/DbState.java
index 2862313521..e649226bc2 100644
--- a/adservices/tests/unittest/service-core/src/com/android/adservices/data/measurement/DbState.java
+++ b/adservices/tests/unittest/service-core/src/com/android/adservices/data/measurement/DbState.java
@@ -226,6 +226,9 @@ public class DbState {
                 .setPublisher(Uri.parse(sJSON.getString("publisher")))
                 .setPublisherType(sJSON.optInt("publisherType"))
                 .setAppDestination(Uri.parse(sJSON.getString("appDestination")))
+                .setWebDestination(parseIfNonNull(sJSON.optString("webDestination", null)))
+                .setAggregateSource(sJSON.optString("aggregationKeys", null))
+                .setAggregateContributions(sJSON.optInt("aggregateContributions"))
                 .setEnrollmentId(sJSON.getString("enrollmentId"))
                 .setEventTime(sJSON.getLong("eventTime"))
                 .setExpiryTime(sJSON.getLong("expiryTime"))
@@ -249,6 +252,8 @@ public class DbState {
                 .setDestinationType(tJSON.optInt("destinationType"))
                 .setEnrollmentId(tJSON.getString("enrollmentId"))
                 .setEventTriggers(tJSON.getString("eventTriggers"))
+                .setAggregateTriggerData(tJSON.optString("aggregatableTriggerData", null))
+                .setAggregateValues(tJSON.optString("aggregatableValues", null))
                 .setTriggerTime(tJSON.getLong("triggerTime"))
                 .setStatus(tJSON.getInt("status"))
                 .setRegistrant(Uri.parse(tJSON.getString("registrant")))
@@ -345,6 +350,14 @@ public class DbState {
                 .setEnrollmentId(rJSON.getString("enrollmentId"))
                 .setDebugCleartextPayload(rJSON.getString("debugCleartextPayload"))
                 .setStatus(rJSON.getInt("status"))
+                .setApiVersion(rJSON.optString("apiVersion", null))
                 .build();
     }
+
+    private Uri parseIfNonNull(String s) {
+        if (s == null) {
+            return null;
+        }
+        return Uri.parse(s);
+    }
 }