Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d81dd2d authored by Fengjiang Li's avatar Fengjiang Li Committed by Android (Google) Code Review
Browse files

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

parents a11802c4 d29db8ea

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

+3 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ public class LauncherDelegate { 
                        // 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,