| commit | 46db057249fc3d8657841f905372f74387b87ecf | [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 | ed0dd6591ededf30541b598b2ca9162880ccb7db | |
| parent | 88cd9aaa6bece70f7d7aebab192558e7123627ad [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: Ie6d11b74141ff777b10f05919b9a61f7af809900
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index d162abd..38beeea 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java
@@ -683,8 +683,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);