diff options
| author | Fengjiang Li <fengjial@google.com> | 2023-06-08 19:33:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-06-08 19:33:52 +0000 |
| commit | 5d81dd2d772dfb9bf8c589554ecd0acdb26150cd (patch) | |
| tree | 3249be44dd220cea9ea2c01b00dedefd2969f89c /src/com/android | |
| parent | a11802c486f8532f55cecb787f69b047e37bebed (diff) | |
| parent | d29db8ea4d0aaefeec160bcc7bbf8ccb80276390 (diff) | |
| download | Launcher3-5d81dd2d772dfb9bf8c589554ecd0acdb26150cd.tar.gz | |
Merge "Fix NPE where CellLayout is null when removing item out of folder" into udc-dev
Diffstat (limited to 'src/com/android')
| -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, |