Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac856e75 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

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

* commit 'e6eb9291':
  Fix NPE in RemoteViews (issue 6408103)
parents abb7bf4f e6eb9291

core/java/android/widget/RemoteViews.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -1058,8 +1058,10 @@ 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;

            if (nestedViews != null) {

                configureRemoteViewsAsChild(nestedViews);

                configureRemoteViewsAsChild(nestedViews);

            }

            }

        }





        public ViewGroupAction(Parcel parcel, BitmapCache bitmapCache) {

        public ViewGroupAction(Parcel parcel, BitmapCache bitmapCache) {

            viewId = parcel.readInt();

            viewId = parcel.readInt();