From c431c156bbb5c59f921c031e56744e5d6f12a77a Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 26 Apr 2012 18:42:17 -0700
Subject: [PATCH] Fix NPE in RemoteViews (issue 6408103)

Change-Id: I3e7ff2941b721c2c0c5c4e7d598df794b105c391
---
 core/java/android/widget/RemoteViews.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index 57a30120e2ad3..e628bc1a40293 100644
--- 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) {