commit 5134643c00a1f683893162d87ccd3fdb12c71b34
author Pinyao Ting <pinyaoting@google.com> Tue Jul 21 19:05:31 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 21 19:05:31 2020 +0000
tree 2f1b41a2beeedfbc46674a6ce07ddbb9483805c2
parent f96e2b89c39ccd9fb0a284f640897e116df663fc
parent 8dae83ee9bab0dcd7982c893926c2ab11d54b0cf

Fix launcher crash after restore with some specific widgets. am: 8dae83ee9b

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

Change-Id: Id8d1b89b92f6d50614911adb90195140737ce924

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