commit 70dd01be8502fbb7cadd289864baf8bbe7d29c92
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Aug 19 15:30:20 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 19 15:30:20 2021 +0000
tree d731a7e5044798338df8082bbae5042c3d9ff76f
parent 686d42a1d454be95d6188aecfa491c7bcee20604
parent 26de7be984b9a9e9d7ce246efcf52b1fb0761653

Merge "Fix NPE when converting final screen to empty screen." into sc-qpr1-dev

src/com/android/launcher3/Workspace.java

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);