diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-08 02:33:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-08 02:33:06 +0000 |
| commit | 5b936a1294e1fba9a05a85197294a33e5a817f45 (patch) | |
| tree | ab0844518604c81b6c96b13f565c44eb393a08aa | |
| parent | bf85d6df3599922d2e69234691d4d026f297bdee (diff) | |
| parent | 0525c2bbde90d3b60dd6b1908ece79b7569eb900 (diff) | |
| download | Calendar-5b936a1294e1fba9a05a85197294a33e5a817f45.tar.gz | |
Merge "AOSP/Calendar - Added a null pointer check for widgetManager based on https://b.corp.google.com/issues/158480522#comment3 (line#540)." am: efb2485b92 am: b89ebb6905 am: 0525c2bbde
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1356364
Change-Id: I1b293fb0c8e0c51f4149a9d2737d1037ae500c5e
| -rw-r--r-- | src/com/android/calendar/widget/CalendarAppWidgetService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/calendar/widget/CalendarAppWidgetService.java b/src/com/android/calendar/widget/CalendarAppWidgetService.java index 6329463b..ec702c7c 100644 --- a/src/com/android/calendar/widget/CalendarAppWidgetService.java +++ b/src/com/android/calendar/widget/CalendarAppWidgetService.java @@ -542,6 +542,9 @@ public class CalendarAppWidgetService extends RemoteViewsService { } AppWidgetManager widgetManager = AppWidgetManager.getInstance(mContext); + if (widgetManager == null) { + return; + } if (mAppWidgetId == -1) { int[] ids = widgetManager.getAppWidgetIds(CalendarAppWidgetProvider .getComponentName(mContext)); |