From 817e0fa812aa1d5798283050ad9dc1ff62575469 Mon Sep 17 00:00:00 2001
From: Alex Chau <alexchau@google.com>
Date: Wed, 8 Sep 2021 20:46:32 +0100
Subject: [PATCH] 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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 1354a7ab37..a9b44d31bb 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2227,6 +2227,9 @@ public class Launcher extends StatefulActivity<LauncherState> implements Launche
             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);
         }