Add fallback when EJ scheduling fails. am: 8d7e5fecbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/23476484
Change-Id: Ie09ae6fef780cc8644b326cbe03ba844232f32f4
Signed-off-by: Automerger Merge Worker <[email protected]>
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");
+ }
}
}
}
