commit 817e0fa812aa1d5798283050ad9dc1ff62575469
author Alex Chau <alexchau@google.com> Wed Sep 08 20:46:32 2021 +0100
committer Alex Chau <alexchau@google.com> Wed Sep 08 21:01:10 2021 +0100
tree 220b16a7be97d2f82a470ac69215ac4d6e84e089
parent 71e766dceaaa845d164ea0fe9ab8975bb3d4c9a4

Fix crash when Workspace item is added to two panel home

Test: Run com.android.launcher3.ui.widgetRequestPinItemTest#testPinShortcut tests
      and com.android.launcher3.ui.TaplTestsLauncher3#testWorkspace
Bug: 199150824
Change-Id: I8550970806eb0b9bfc246d4fb76ffbd0415b7647

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1354a7a..a9b44d3 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2227,6 +2227,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);
         }