| commit | 8354f61df5666fcdc3389cea0a33aec55edff668 | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Mon Jun 07 20:51:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 07 20:51:43 2021 +0000 |
| tree | f59c0556a805c84c2bb788b96d0af9b862617a31 | |
| parent | 8235469f43399238a14d84cd2dda3dca749cffbe [diff] | |
| parent | 0062822976806b58145a2e8f7446cfc0730bc4de [diff] |
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: Ic9ded2e2ab8bc4d03914b045b6cd46fcfa4bca74
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 */);