commit 74baee14e256a2917863def385fff2bcf8e3fa61
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 21 18:45:04 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 21 18:45:04 2020 +0000
tree 6582028729049af72bd0b3952ad12ec909f14c02
parent 5b832096e04a88b6457c71ded6b66fa60b3c216e
parent 664020146f1a9b4280ee7ce389b22040c5d4b593

Merge "Fix launcher crash after restore with some specific widgets." into ub-launcher3-rvc-qpr-dev am: 664020146f

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

Change-Id: I2f180f865b2bcf51913b1185514095994b997170

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