diff options
| author | 2016-07-12 17:01:30 +0000 | |
|---|---|---|
| committer | 2016-07-12 17:01:30 +0000 | |
| commit | 36c0136177d03e078de24c1eae04956c7ea2e54b (patch) | |
| tree | 1121c6fac5fb828ddd4b9eeabd82deb544ddd5a1 /services/appwidget/java | |
| parent | b8e3b41d486a4d2e32ee1a514be6c029a76a233e (diff) | |
| parent | 9d1e68ab1bfaf638c4d61e1723665f8d544a52bc (diff) | |
Merge \\"Guard against null object in scheduleNotifyUpdateAppWidgetLocked\\" into nyc-mr1-dev am: 26504a611a
am: 9d1e68ab1b
Change-Id: Ib09e0a5ba83959ef9ea418066c7ad16b1ab2238c
Diffstat (limited to 'services/appwidget/java')
| -rw-r--r-- | services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 2c33a8367426..47094be808cf 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -1905,7 +1905,7 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku SomeArgs args = SomeArgs.obtain(); args.arg1 = widget.host; args.arg2 = widget.host.callbacks; - args.arg3 = updateViews.clone(); + args.arg3 = (updateViews != null) ? updateViews.clone() : null; args.arg4 = requestTime; args.argi1 = widget.appWidgetId; |