commit d29db8ea4d0aaefeec160bcc7bbf8ccb80276390
author Fengjiang Li <fengjial@google.com> Thu Jun 01 15:20:34 2023 -0700
committer Fengjiang Li <fengjial@google.com> Wed Jun 07 15:36:54 2023 -0700
tree e55f8421cc3910f7938a1040008349ee7bf0600f
parent 052045907c3fbaffe44d07aec28f8fb428bd14c4

Fix NPE where CellLayout is null when removing item out of folder

Fix: 282249989
Test: create a folder of 2 app icons, remove one icon out of folder, no crash
Change-Id: I3c132ec8833c7cb14066cc403c0641d089bab8ab

src/com/android/launcher3/folder/LauncherDelegate.java

diff --git a/src/com/android/launcher3/folder/LauncherDelegate.java b/src/com/android/launcher3/folder/LauncherDelegate.java
index 3e55425..f15dc83 100644
--- a/src/com/android/launcher3/folder/LauncherDelegate.java
+++ b/src/com/android/launcher3/folder/LauncherDelegate.java
@@ -94,6 +94,9 @@
                         // folder
                         CellLayout cellLayout = mLauncher.getCellLayout(info.container,
                                 info.screenId);
+                        if (cellLayout == null) {
+                            return;
+                        }
                         finalItem =  info.contents.remove(0);
                         newIcon = mLauncher.createShortcut(cellLayout, finalItem);
                         mLauncher.getModelWriter().addOrMoveItemInDatabase(finalItem,