summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-07-16 21:33:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-07-16 21:33:14 +0000
commit61f93037cffbf6cb3cada2228a0c0abea37e6367 (patch)
treec9d015fe77995aa3a457851659dd9a9cf86d4da1
parente73ca09977daab2edd4b6abf7690e93b39445bba (diff)
parent9d4977566a84b2186b6912c7bf38645093d6f585 (diff)
downloadCalendar-61f93037cffbf6cb3cada2228a0c0abea37e6367.tar.gz
Merge "Snap for 6686656 from efb2485b9258d237e8c3e93ea69011c2c628fdd2 to sdk-release" into sdk-releaseplatform-tools-30.0.4
-rw-r--r--src/com/android/calendar/widget/CalendarAppWidgetService.java3
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));