commit 9c17c9f0464b81994a34631b2ccd3fe566e27453
author Fengjiang Li <fengjial@google.com> Thu Jun 08 19:51:07 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 08 19:51:07 2023 +0000
tree 617a3a698e34a067c13658bdc62d98c81b34f1d4
parent 435ab92b46566f9bc048a2746507632ad24fb768
parent d0642ee5891cebd4608b21f40fd260c1fab585b7

Merge "Fix NPE where CellLayout is null when removing item out of folder" into udc-dev am: 5d81dd2d77 am: d0642ee589

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23521759

Change-Id: I92674e401f3280237dba0551687ce81f3ff01bd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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,