diff options
| author | 2021-03-18 13:32:33 -0700 | |
|---|---|---|
| committer | 2021-03-18 15:28:00 -0700 | |
| commit | 5230666bb7552f4545f20e99875016574ddaf416 (patch) | |
| tree | a0b6361cac516f0eeee39617b2a0632a55dbb85e | |
| parent | fbb1317a2183cef98f03fe123d1d04e09af257ee (diff) | |
Revert "Ensure the view being recycled has been inflated before."
This reverts commit 54deae4c6902cf405a29c30b86a65878a326f170.
Bug: 183104573
Test: Install from Play Store with the screen off on wembley, and the device doesn't crash when the screen turns back on.
Change-Id: I36d4736af5853ab99e2d2024de8679ac8991bd58
| -rw-r--r-- | core/java/android/widget/RemoteViews.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 11ac7f2a5167..0cedcea7b4d4 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -5339,13 +5339,9 @@ public class RemoteViews implements Parcelable, Filter { /** @hide */ public boolean canRecycleView(View v) { - Integer previousLayout = (Integer) v.getTag(R.id.widget_frame); - if (previousLayout == null) { - return false; - } Integer overrideIdTag = (Integer) v.getTag(R.id.remote_views_override_id); int overrideId = overrideIdTag == null ? View.NO_ID : overrideIdTag; - return previousLayout == getLayoutId() && mViewId == overrideId; + return (Integer) v.getTag(R.id.widget_frame) == getLayoutId() && mViewId == overrideId; } // Note: topLevel should be true only for calls on the topLevel RemoteViews, internal calls |