commit a07932fb77e4e90876c95ebe265cc74e5d818cab
author Pinyao Ting <pinyaoting@google.com> Tue Jul 21 19:40:54 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 21 19:40:54 2020 +0000
tree 5febc97c2ac73e5067a0bfacbfebc41de7e97136
parent 1e61df9428e4f7d62c63be9dd65f52da1f599ae3
parent 1b31a723882ad283d83c44b764689b78494b0ede

Fix launcher crash after restore with some specific widgets. am: 8dae83ee9b am: 5134643c00 am: 1b31a72388

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12196250

Change-Id: If7e4e70efbbfc534e9359bf2df3a1b559ed7a497

src/com/android/launcher3/widget/PendingAppWidgetHostView.java

diff --git a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
index 9021d9e..ca47728 100644
--- a/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/PendingAppWidgetHostView.java
@@ -52,7 +52,6 @@
     private static final float MIN_SATUNATION = 0.7f;
 
     private final Rect mRect = new Rect();
-    private View mDefaultView;
     private OnClickListener mClickListener;
     private final LauncherAppWidgetInfo mInfo;
     private final int mStartState;
@@ -111,12 +110,11 @@
 
     @Override
     protected View getDefaultView() {
-        if (mDefaultView == null) {
-            mDefaultView = mInflater.inflate(R.layout.appwidget_not_ready, this, false);
-            mDefaultView.setOnClickListener(this);
-            applyState();
-        }
-        return mDefaultView;
+        View defaultView = mInflater.inflate(R.layout.appwidget_not_ready, this, false);
+        defaultView.setOnClickListener(this);
+        applyState();
+        invalidate();
+        return defaultView;
     }
 
     @Override