diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-08 04:40:37 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-08 04:40:37 +0000 |
| commit | d6e239554b25cb6a0396e5095aa007f52e589b64 (patch) | |
| tree | 45f7b8863a37c4e7f13775500858677fd947332e | |
| parent | 528f40746522018f6553fddfedd01446411f741a (diff) | |
| parent | 79b15fa9ed4496a4a1f50f5f0fbe2527a6f76c5e (diff) | |
| download | CalendarProvider-android14-mainline-healthfitness-release.tar.gz | |
Snap for 10460766 from 79b15fa9ed4496a4a1f50f5f0fbe2527a6f76c5e to mainline-healthfitness-releaseaml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030android14-mainline-healthfitness-release
Change-Id: Icc7b593a7dd58d3a08402a3b83603bfcb3b7fddf
| -rw-r--r-- | res/values-zh-rHK/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 5c7247c..7f5ff5b 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -26,7 +26,7 @@ <string name="provider_label" msgid="1910026788169486138">"日曆"</string> <string name="debug_tool_delete_button" msgid="2843837310185088850">"立即刪除"</string> <string name="debug_tool_start_button" msgid="2827965939935983665">"開始"</string> - <string name="debug_tool_message" msgid="2315979068524074618">"你即將 1) 在 SD 卡或 USB 儲存空間中儲存任何應用程式均可讀取的日曆資料庫副本，並且 2) 以電郵傳送日曆資料庫。請緊記，待成功從裝置複製日曆資料庫或收到電郵後，請隨即刪除日曆資料庫。"</string> + <string name="debug_tool_message" msgid="2315979068524074618">"您即將 1) 在 SD 卡或 USB 儲存空間中儲存任何應用程式均可讀取的日曆資料庫副本，並且 2) 以電郵傳送日曆資料庫。請緊記，待成功從裝置複製日曆資料庫或收到電郵後，請隨即刪除日曆資料庫。"</string> <string name="debug_tool_email_sender_picker" msgid="2527150861906694072">"選擇要用來傳送檔案的程式"</string> <string name="debug_tool_email_subject" msgid="1450453531950410260">"內含「日曆」資料庫附件"</string> <string name="debug_tool_email_body" msgid="1271714905048793618">"附上我的「日曆」資料庫，其中包含我所有的預約和個人資料，請謹慎處理。"</string> 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 @@ public class CalendarProviderBroadcastReceiver extends BroadcastReceiver { } 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"); + } } } } |