diff options
| author | Varun Shah <varunshah@google.com> | 2023-04-28 05:19:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-28 05:19:08 +0000 |
| commit | 0c3e6e99ef58189387bbf728d583550472407fcb (patch) | |
| tree | 410d8fe963ac9dc49bc4f264244b759da1a10811 | |
| parent | d98e53101fedddf0b0fa4487e1863b861619d2c8 (diff) | |
| parent | 4987fa111d9363b2c3c3b2c7adb0290691e1c111 (diff) | |
| download | CalendarProvider-0c3e6e99ef58189387bbf728d583550472407fcb.tar.gz | |
Fix NPE in CalendarProviderBroadcastReceiver. am: b6457c86d1 am: 4987fa111d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/22915099
Change-Id: Iee996a190b8a6271a214d568a2b627f15816f535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java b/src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java index c27044f..af3b412 100644 --- a/src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java +++ b/src/com/android/providers/calendar/CalendarProviderBroadcastReceiver.java @@ -34,8 +34,9 @@ public class CalendarProviderBroadcastReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { String action = intent.getAction(); - if (!CalendarAlarmManager.ACTION_CHECK_NEXT_ALARM.equals(action) - && !CalendarContract.ACTION_EVENT_REMINDER.equals(action)) { + if (action == null || + (!CalendarAlarmManager.ACTION_CHECK_NEXT_ALARM.equals(action) + && !CalendarContract.ACTION_EVENT_REMINDER.equals(action))) { Log.e(TAG, "Received invalid intent: " + intent); setResultCode(Activity.RESULT_CANCELED); return; |