Merge "Guard against null object in scheduleNotifyUpdateAppWidgetLocked" into nyc-mr1-dev

2016-07-12 16:37:54 +00:00
parent 60bbfacd4e 1bd6452e0f
commit 26504a611a
1 changed files with 1 additions and 1 deletions
--- 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;