commit fd744975cc17902d69ada05bfad8c14bee859839
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 08 22:09:53 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 08 22:09:53 2021 +0000
tree cc42879cc6461200cca5da5ed6fc60ac56a971b8
parent fd5e2ff9332c8a9074b007c2bca3602269a6d921
parent 817e0fa812aa1d5798283050ad9dc1ff62575469

Merge "Fix crash when Workspace item is added to two panel home" into sc-v2-dev

src/com/android/launcher3/Launcher.java

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);
         }