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

Merge "Revert "Always check if the view can be recycled."" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-08 23:21:31 +00:00
committed by Android (Google) Code Review
parent 217e1d8819 951bc7d892
commit 533ce6f9f0
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5746,9 +5746,11 @@ public class RemoteViews implements Parcelable, Filter {
// persisted across change, and has the RemoteViews re-applied in a different situation // 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 // (orientation or size), we throw an exception, since the layouts may be completely
// unrelated. // unrelated.
if (!rvToApply.canRecycleView(v)) { if (hasMultipleLayouts()) {
throw new RuntimeException("Attempting to re-apply RemoteViews to a view that" if (!rvToApply.canRecycleView(v)) {
+ " 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); 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 // 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, // across orientation change, and has the RemoteViews re-applied in the new orientation,
// we throw an exception, since the layouts may be completely unrelated. // we throw an exception, since the layouts may be completely unrelated.
if (!rvToApply.canRecycleView(v)) { if (hasMultipleLayouts()) {
throw new RuntimeException("Attempting to re-apply RemoteViews to a view that" if (!rvToApply.canRecycleView(v)) {
+ " 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(), return new AsyncApplyTask(rvToApply, (ViewGroup) v.getParent(),