diff options
| author | Varun Shah <varunshah@google.com> | 2023-04-28 04:38:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-28 04:38:32 +0000 |
| commit | 869f44e740326d755739be2fad395b4a423b1826 (patch) | |
| tree | 410d8fe963ac9dc49bc4f264244b759da1a10811 | |
| parent | c59dc930e037077bc046200cca7848de06837a68 (diff) | |
| parent | b6457c86d10240da344f994e26fa2ee200639317 (diff) | |
| download | CalendarProvider-869f44e740326d755739be2fad395b4a423b1826.tar.gz | |
Fix NPE in CalendarProviderBroadcastReceiver. am: b6457c86d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/22915099
Change-Id: Iefdd9736f08a961b0edad0fdbd6c4ef4c2196bfc
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; |