diff options
| author | Fengjiang Li <fengjial@google.com> | 2023-06-01 15:20:34 -0700 |
|---|---|---|
| committer | Fengjiang Li <fengjial@google.com> | 2023-06-07 15:36:54 -0700 |
| commit | d29db8ea4d0aaefeec160bcc7bbf8ccb80276390 (patch) | |
| tree | e55f8421cc3910f7938a1040008349ee7bf0600f /src | |
| parent | 052045907c3fbaffe44d07aec28f8fb428bd14c4 (diff) | |
| download | Launcher3-d29db8ea4d0aaefeec160bcc7bbf8ccb80276390.tar.gz | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/folder/LauncherDelegate.java | 3 |
1 files changed, 3 insertions, 0 deletions
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, |