diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-08 02:14:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-08 02:14:07 +0000 |
| commit | 0525c2bbde90d3b60dd6b1908ece79b7569eb900 (patch) | |
| tree | ab0844518604c81b6c96b13f565c44eb393a08aa | |
| parent | 4c100ad41f8beb6de43752bc4fbbd6cc723adf3e (diff) | |
| parent | b89ebb6905eca4a52d5685bb33ed6a14156102d5 (diff) | |
| download | Calendar-0525c2bbde90d3b60dd6b1908ece79b7569eb900.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
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Calendar/+/1356364
Change-Id: I25a69ac99dc29101979d772e91feb440d1a16614
| -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)); |