| commit | 63db45c1d9ecc5fe07e843ad21c0d3f3e0b1dbca | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Sep 08 22:31:40 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 08 22:31:40 2021 +0000 |
| tree | 4ba86894c3bf8609e147713af6310c9167353519 | |
| parent | 95f4acc95ab1e272e5e9ce3f8e5a9f199dcc3d33 [diff] | |
| parent | 1bde92ca954c01a0ea922af686b500e3a4d9a75a [diff] |
Merge "Fix crash when Workspace item is added to two panel home" into sc-v2-dev am: fd744975cc am: 1bde92ca95 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15786971 Change-Id: Icc319f23eab7545c196e2b95a5c27e428a63cf7b
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 8e1a09c..ed9f044 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java
@@ -2229,6 +2229,9 @@ ArrayList<ItemInfo> addAnimated) { // Add the new screens if (newScreens != null) { + // newScreens can contain an empty right panel that is already bound, but not known + // by BgDataModel. + newScreens.removeAllValues(mWorkspace.mScreenOrder); bindAddScreens(newScreens); }