commit b62e4839bc6dbd466ca45a87d924259917c87d88
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 31 23:21:19 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 31 23:21:19 2023 +0000
tree 2396876e21550a5c8acc5b4f0f96669304253b46
parent bc0b881c391da1775f093f2f1409cfcc4c6004a9
parent 3fafd94b354b78635530c1e75a76041c9b79d8e3

Snap for 10234618 from 3fafd94b354b78635530c1e75a76041c9b79d8e3 to udc-d1-release

Change-Id: Ib848559c7f45eedcdc1dbbe0ba8e62605da0a469

src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java

diff --git a/src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java b/src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java
index af3b412..933baf2 100644
--- a/src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java
+++ b/src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java
@@ -46,15 +46,21 @@
         }
 
         JobWorkItem jwi = new JobWorkItem(intent);
-        JobInfo alarmJob = new JobInfo.Builder(CalendarProviderJobService.JOB_ID,
+        JobInfo.Builder alarmJobBuilder = new JobInfo.Builder(CalendarProviderJobService.JOB_ID,
                 new ComponentName(context, CalendarProviderJobService.class))
-                .setExpedited(true)
-                .build();
+                .setExpedited(true);
         JobScheduler jobScheduler = context.getSystemService(JobScheduler.class);
-        if (jobScheduler.enqueue(alarmJob, jwi) == JobScheduler.RESULT_SUCCESS) {
+        if (jobScheduler.enqueue(alarmJobBuilder.build(), jwi) == JobScheduler.RESULT_SUCCESS) {
             setResultCode(Activity.RESULT_OK);
         } else {
             Slog.wtf(TAG, "Failed to schedule expedited job");
+            // Unable to schedule an expedited job. Fall back to a regular job.
+            alarmJobBuilder.setExpedited(false);
+            if (jobScheduler.enqueue(alarmJobBuilder.build(), jwi) == JobScheduler.RESULT_SUCCESS) {
+                setResultCode(Activity.RESULT_OK);
+            } else {
+                Slog.wtf(TAG, "Failed to schedule regular job");
+            }
         }
     }
 }