From d29db8ea4d0aaefeec160bcc7bbf8ccb80276390 Mon Sep 17 00:00:00 2001
From: Fengjiang Li <fengjial@google.com>
Date: Thu, 1 Jun 2023 15:20:34 -0700
Subject: 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 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/com/android/launcher3/folder/LauncherDelegate.java b/src/com/android/launcher3/folder/LauncherDelegate.java
index 3e55425fdc..f15dc83387 100644
--- a/src/com/android/launcher3/folder/LauncherDelegate.java
+++ b/src/com/android/launcher3/folder/LauncherDelegate.java
@@ -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,
-- 
cgit v1.2.3