diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-11-05 12:59:02 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-05 12:59:02 -0800 |
| commit | c1f6ff058e5ccc707a7133c036f2b19adc5b7faf (patch) | |
| tree | f513fe6d803e7f8f4ec8e70ae4563115b48cede7 | |
| parent | 8d8ea9eb439ab3f24cc592001beea6884e1b70d1 (diff) | |
| parent | 39a9ebe5c53026006fc777739ba25b067eb417a8 (diff) | |
| download | Calendar-c1f6ff058e5ccc707a7133c036f2b19adc5b7faf.tar.gz | |
Merge "AOSP/Calendar - Fix crash bug when null action is sent to com.android.calendar/.widget.CalendarAppWidgetProvider." am: 537758eb52 am: 161ed60830
am: 39a9ebe5c5
Change-Id: I790e8b8704684aba4c0e14851c4744188017c326
| -rw-r--r-- | src/com/android/calendar/widget/CalendarAppWidgetProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/calendar/widget/CalendarAppWidgetProvider.java b/src/com/android/calendar/widget/CalendarAppWidgetProvider.java index 2864d47a..3a69efd3 100644 --- a/src/com/android/calendar/widget/CalendarAppWidgetProvider.java +++ b/src/com/android/calendar/widget/CalendarAppWidgetProvider.java @@ -64,11 +64,11 @@ public class CalendarAppWidgetProvider extends AppWidgetProvider { performUpdate(context, appWidgetManager, appWidgetManager.getAppWidgetIds(getComponentName(context)), null /* no eventIds */); - } else if (action.equals(Intent.ACTION_PROVIDER_CHANGED) + } else if (action != null && (action.equals(Intent.ACTION_PROVIDER_CHANGED) || action.equals(Intent.ACTION_TIME_CHANGED) || action.equals(Intent.ACTION_TIMEZONE_CHANGED) || action.equals(Intent.ACTION_DATE_CHANGED) - || action.equals(Utils.getWidgetScheduledUpdateAction(context))) { + || action.equals(Utils.getWidgetScheduledUpdateAction(context)))) { Intent service = new Intent(context, CalendarAppWidgetService.class); context.startService(service); } else { |