commit 623f049bbe3642746c0f2339bbbba2ed72d16fb3
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:29:22 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 05:29:22 2023 +0000
tree 45f7b8863a37c4e7f13775500858677fd947332e
parent 0365e10cb378c2b2247d604f37795cdc17c6bacb
parent 79b15fa9ed4496a4a1f50f5f0fbe2527a6f76c5e

Snap for 10453563 from 79b15fa9ed4496a4a1f50f5f0fbe2527a6f76c5e to mainline-tzdata5-release

Change-Id: Icd5538e349e8a22b374b9672723c0617406947f6

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");
+            }
         }
     }
 }