commit 23b50a34be3d805204b8962ebc5e57abf2f95838
author Steven Ng <stevenckng@google.com> Mon Jun 07 20:50:11 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 07 20:50:11 2021 +0000
tree 7c047d47c72ec4c2b6a163f5be8b2b2631c23676
parent 8874da2534157381b4f8eed4aaa7451c40c1911a
parent 0062822976806b58145a2e8f7446cfc0730bc4de

Merge "Fix preview layout crash upon screen rotation" into sc-dev am: 0062822976

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

Change-Id: I59585ddcaa103c17b834e52cb2c5e9efd9db3709

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

diff --git a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
index fad9b0b..50ab422 100644
--- a/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java
@@ -492,6 +492,10 @@
             return;
         }
         LauncherAppWidgetInfo info = (LauncherAppWidgetInfo) getTag();
+        if (info == null) {
+            // This occurs when LauncherAppWidgetHostView is used to render a preview layout.
+            return;
+        }
         // Remove and rebind the current widget (which was inflated in the wrong
         // orientation), but don't delete it from the database
         mLauncher.removeItem(this, info, false  /* deleteFromDb */);