| commit | 5980159f00190c19b89d1d534709a2651ac45470 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Aug 19 15:43:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 19 15:43:06 2021 +0000 |
| tree | d1a69c33571c2e791aad6fdf6970cacec2d23d09 | |
| parent | 7e5f1003bd9c2b15e12c5b63136dc993f0536913 [diff] | |
| parent | 70dd01be8502fbb7cadd289864baf8bbe7d29c92 [diff] |
Merge "Fix NPE when converting final screen to empty screen." into sc-qpr1-dev am: 70dd01be85 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15583988 Change-Id: I436611efcf40cb7e5311a1ff4b0ed79635114e29
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 5bdc402..2bb4e5c 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java
@@ -687,8 +687,9 @@ CellLayout finalScreen = mWorkspaceScreens.get(finalScreenId); // If the final screen is empty, convert it to the extra empty screen - if (finalScreen.getShortcutsAndWidgets().getChildCount() == 0 && - !finalScreen.isDropPending()) { + if (finalScreen != null + && finalScreen.getShortcutsAndWidgets().getChildCount() == 0 + && !finalScreen.isDropPending()) { mWorkspaceScreens.remove(finalScreenId); mScreenOrder.removeValue(finalScreenId);