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
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java
index 11ac7f2..0cedcea 100644
--- a/core/java/android/widget/RemoteViews.java
+++ b/core/java/android/widget/RemoteViews.java
@@ -5339,13 +5339,9 @@
/** @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