Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev

2012-04-26 18:45:18 -07:00
parent f18222da3c c431c156bb
commit e6eb929142
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -1058,7 +1058,9 @@ public class RemoteViews implements Parcelable, Filter {
        public ViewGroupAction(int viewId, RemoteViews nestedViews) {
            this.viewId = viewId;
            this.nestedViews = nestedViews;
-            configureRemoteViewsAsChild(nestedViews);
+            if (nestedViews != null) {
+                configureRemoteViewsAsChild(nestedViews);
+            }
        }

        public ViewGroupAction(Parcel parcel, BitmapCache bitmapCache) {