Snap for 9254005 from 7b99dc653ed133fef81d0423fee87d45299097e2 to mainline-ipsec-releaseaml_ips_331910010aml_ips_331312000aml_ips_331310000android13-mainline-ipsec-release

Change-Id: Id77860bb313cd5104abdea4a778d197a1db28861

1 files changed, 14 insertions, 9 deletions

diff --git a/adservices/service-core/java/com/android/adservices/service/measurement/attribution/AttributionJobService.java b/adservices/service-core/java/com/android/adservices/service/measurement/attribution/AttributionJobService.java
index 994c504bf5..99cbbfef13 100644
--- a/adservices/service-core/java/com/android/adservices/service/measurement/attribution/AttributionJobService.java
+++ b/adservices/service-core/java/com/android/adservices/service/measurement/attribution/AttributionJobService.java
@@ -32,6 +32,7 @@ import com.android.adservices.service.AdServicesConfig;
 import com.android.adservices.service.FlagsFactory;
 import com.android.adservices.service.measurement.SystemHealthParams;
 import com.android.adservices.service.measurement.Trigger;
+import com.android.adservices.service.measurement.reporting.DebugReportingJobService;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.util.concurrent.Executor;
@@ -67,6 +68,7 @@ public class AttributionJobService extends JobService {
                     jobFinished(params, !success);
                     // jobFinished is asynchronous, so forcing scheduling avoiding concurrency issue
                     scheduleIfNeeded(this, /* forceSchedule */ true);
+                    DebugReportingJobService.scheduleIfNeeded(getApplicationContext(), true);
                 });
         return true;
     }
@@ -80,15 +82,18 @@ public class AttributionJobService extends JobService {
     /** Schedules {@link AttributionJobService} to observer {@link Trigger} content URI change. */
     @VisibleForTesting
     static void schedule(Context context, JobScheduler jobScheduler) {
-        final JobInfo job = new JobInfo.Builder(AdServicesConfig.MEASUREMENT_ATTRIBUTION_JOB_ID,
-                new ComponentName(context, AttributionJobService.class))
-                .addTriggerContentUri(new JobInfo.TriggerContentUri(
-                        TriggerContentProvider.TRIGGER_URI,
-                        JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS
-                ))
-                .setTriggerContentUpdateDelay(
-                        SystemHealthParams.ATTRIBUTION_JOB_TRIGGERING_DELAY_MS)
-                .build();
+        final JobInfo job =
+                new JobInfo.Builder(
+                                AdServicesConfig.MEASUREMENT_ATTRIBUTION_JOB_ID,
+                                new ComponentName(context, AttributionJobService.class))
+                        .addTriggerContentUri(
+                                new JobInfo.TriggerContentUri(
+                                        TriggerContentProvider.TRIGGER_URI,
+                                        JobInfo.TriggerContentUri.FLAG_NOTIFY_FOR_DESCENDANTS))
+                        .setTriggerContentUpdateDelay(
+                                SystemHealthParams.ATTRIBUTION_JOB_TRIGGERING_DELAY_MS)
+                        .setPersisted(false) // Can't call addTriggerContentUri() on a persisted job
+                        .build();
         jobScheduler.schedule(job);
     }