| commit | d6578da29915883c7588f39598006c630b4d1d03 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Aug 19 15:51:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 19 15:51:12 2021 +0000 |
| tree | 5b3b7b694c85e62d6e50723becf03f5390f7786e | |
| parent | 3ed2933399835305a297ce24c2678aa6a6f4a754 [diff] | |
| parent | 5980159f00190c19b89d1d534709a2651ac45470 [diff] |
Merge "Fix NPE when converting final screen to empty screen." into sc-qpr1-dev am: 70dd01be85 am: 5980159f00 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15583988 Change-Id: If0b63751d63e33b402152c6953bb4125f0c62597
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);