commit 5d81dd2d772dfb9bf8c589554ecd0acdb26150cd
author Fengjiang Li <fengjial@google.com> Thu Jun 08 19:33:52 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 08 19:33:52 2023 +0000
tree 3249be44dd220cea9ea2c01b00dedefd2969f89c
parent a11802c486f8532f55cecb787f69b047e37bebed
parent d29db8ea4d0aaefeec160bcc7bbf8ccb80276390

Merge "Fix NPE where CellLayout is null when removing item out of folder" into udc-dev

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,