Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
parent abb7bf4ff8 e6eb929142
commit ac856e75c6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/RemoteViews.java
View File

@@ -1058,7 +1058,9 @@ public class RemoteViews implements Parcelable, Filter {
public ViewGroupAction(int viewId, RemoteViews nestedViews) { public ViewGroupAction(int viewId, RemoteViews nestedViews) {
this.viewId = viewId; this.viewId = viewId;
this.nestedViews = nestedViews; this.nestedViews = nestedViews;
configureRemoteViewsAsChild(nestedViews); if (nestedViews != null) {
configureRemoteViewsAsChild(nestedViews);
}
} }
public ViewGroupAction(Parcel parcel, BitmapCache bitmapCache) { public ViewGroupAction(Parcel parcel, BitmapCache bitmapCache) {