| commit | ef4cdc11beb6398f3730812ddd05fef5d37f7e5e | [log] [tgz] |
|---|---|---|
| author | Steven Ng <stevenckng@google.com> | Mon Jun 07 21:04:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 07 21:04:55 2021 +0000 |
| tree | fb7e6fff246c2310cd68a99fb41e25dd51620808 | |
| parent | 153ab1613c6183b4946d465d1feb142693ba25ea [diff] | |
| parent | 8354f61df5666fcdc3389cea0a33aec55edff668 [diff] |
Merge "Fix preview layout crash upon screen rotation" into sc-dev am: 0062822976 am: 8354f61df5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14881297 Change-Id: I6b32b7fd75459f4c3fa4de9178f1bf8eab338c49
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 */);