commit aee455998e972bd3cc8f4594145addcd8822de2f
author Yan Zhang <yanzhangnyc@google.com> Thu Jul 06 02:11:05 2023 +0000
committer Yan Zhang <yanzhangnyc@google.com> Fri Jul 07 11:52:04 2023 +0000
tree b1bc3636ec95a95dfbe67e897360d5ed224f5903
parent 8e72d9b317fb61732b530aee883b6b202762c7e5

Change current time from system to trigger time

Test: atest AdServicesServiceCoreUnitTests:MeasurementDbMigratorV13Test AdServicesServiceCoreUnitTests:MeasurementDaoTest AdServicesServiceCoreUnitTests:EventTriggerTest AdServicesServiceCoreUnitTests:EventReportTest AdServicesServiceCoreUnitTests:TriggerTest AdServicesServiceCoreUnitTests:ReportSpecTest AdServicesServiceCoreUnitTests:MeasurementDataDeleterTest AdServicesServiceCoreUnitTests:CombinatoricsTest AdServicesServiceCoreUnitTests:SourceTest AdServicesServiceCoreUnitTests:AsyncRegistrationQueueRunnerTest AdServicesServiceCoreUnitTests:AsyncSourceFetcherTest AdServicesServiceCoreUnitTests:ReportSpecUtilTest AdServicesServiceCoreUnitTests:EventReportWindowCalcDelegateTest AdServicesServiceCoreUnitTests:TriggerSpecTest AdServicesServiceCoreUnitTests:AggregatePayloadGeneratorTest AdServicesServiceCoreUnitTests:SourceNoiseHandlerAttributionProbabilityTest AdServicesServiceCoreUnitTests:DebugKeyAccessorTest AdServicesServiceCoreUnitTests:DebugReportApiTest AdServicesServiceCoreUnitTests:DebugTest
Bug: 268703833
Change-Id: I0300aa5d8d06e242aa613817a1bcd79c1fd7327e

adservices/service-core/java/com/android/adservices/service/measurement/ReportSpecUtil.java

diff --git a/adservices/service-core/java/com/android/adservices/service/measurement/ReportSpecUtil.java b/adservices/service-core/java/com/android/adservices/service/measurement/ReportSpecUtil.java
index d8a6397..789aa37 100644
--- a/adservices/service-core/java/com/android/adservices/service/measurement/ReportSpecUtil.java
+++ b/adservices/service-core/java/com/android/adservices/service/measurement/ReportSpecUtil.java
@@ -66,16 +66,16 @@
             // No competing condition.
             return new Pair<>(new ArrayList<>(), bucketIncrements);
         }
-        long currentTime = System.currentTimeMillis();
+        long triggerTime = proposedEventReport.getTriggerTime();
         reportSpec.insertAttributedTrigger(proposedEventReport);
         List<EventReport> pendingEventReports =
                 currentReports.stream()
-                        .filter((r) -> r.getReportTime() > currentTime)
+                        .filter((r) -> r.getReportTime() > triggerTime)
                         .collect(Collectors.toList());
         int numDeliveredReport =
                 (int)
                         currentReports.stream()
-                                .filter((r) -> r.getReportTime() <= currentTime)
+                                .filter((r) -> r.getReportTime() <= triggerTime)
                                 .count();
 
         for (EventReport report : currentReports) {