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

Commit 951bc7d8 authored by Daniel Chapin's avatar Daniel Chapin
Browse files

Revert "Always check if the view can be recycled." 

Revert "Add test checking view recycling is always tested"

Revert submission 16149646-betterRecycling

Reason for revert: Droidfood Blocking Bug: 205503898
Reverted Changes:
Ib01c511e4:Always check if the view can be recycled.
If11dcd323:Add test checking view recycling is always tested

Change-Id: Id08d5ea3602d9d3ca03e148e57a9f97435534e2c
parent 8011a285

core/java/android/widget/RemoteViews.java

+10 −6
Original line number Diff line number Diff line
@@ -5746,9 +5746,11 @@ 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);
@@ -5792,9 +5794,11 @@ 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(),