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

* commit 'e6eb9291423988e4f2e82367d760490397222fe3':
  Fix NPE in RemoteViews (issue 6408103)
This commit is contained in:
Adam Cohen
2012-04-26 18:46:51 -07:00
committed by Android Git Automerger

View File

@@ -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) {