commit 26de7be984b9a9e9d7ce246efcf52b1fb0761653
author Jon Miranda <jonmiranda@google.com> Tue Jul 27 10:34:54 2021 -0700
committer Jonathan Miranda <jonmiranda@google.com> Mon Aug 16 16:47:11 2021 +0000
tree 90b628204a2c199da4ae0b4aa867724c44474196
parent e52a4e39afbf76cd6cc293e498dae34e4a097b65

Fix NPE when converting final screen to empty screen.

Bug: 194553613
Test: manual
Change-Id: Id29b8574964688f6f6aa96dd5b1b8a4d8b9110c0

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