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

Commit da66fe32 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Always check if the view can be recycled." into sc-v2-dev am: 1c3b93b1 am: 3af77fe3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16153069

Change-Id: I3250675f3d830463e83b232d1c23af17f8cde317
parents fcb2dbea 3af77fe3

core/java/android/widget/RemoteViews.java

+6 −10
Original line number Diff line number Diff line
@@ -5746,11 +5746,9 @@ public class RemoteViews implements Parcelable, Filter { 
        // persisted across change, and has the RemoteViews re-applied in a different situation

        // (orientation or size), we throw an exception, since the layouts may be completely

        // unrelated.

        if (hasMultipleLayouts()) {

        if (!rvToApply.canRecycleView(v)) {

                throw new RuntimeException("Attempting to re-apply RemoteViews to a view that" +

                        " that does not share the same root layout id.");

            }

            throw new RuntimeException("Attempting to re-apply RemoteViews to a view that"

                    + " that does not share the same root layout id.");

        }



        rvToApply.performApply(v, (ViewGroup) v.getParent(), handler, colorResources);
@@ -5794,11 +5792,9 @@ public class RemoteViews implements Parcelable, Filter { 
        // In the case that a view has this RemoteViews applied in one orientation, is persisted

        // across orientation change, and has the RemoteViews re-applied in the new orientation,

        // we throw an exception, since the layouts may be completely unrelated.

        if (hasMultipleLayouts()) {

        if (!rvToApply.canRecycleView(v)) {

                throw new RuntimeException("Attempting to re-apply RemoteViews to a view that" +

                        " that does not share the same root layout id.");

            }

            throw new RuntimeException("Attempting to re-apply RemoteViews to a view that"

                    + " that does not share the same root layout id.");

        }



        return new AsyncApplyTask(rvToApply, (ViewGroup) v.getParent(),