Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26de7be9 authored by Jon Miranda's avatar Jon Miranda Committed by Jonathan Miranda
Browse files

Fix NPE when converting final screen to empty screen. 

Bug: 194553613
Test: manual
Change-Id: Id29b8574964688f6f6aa96dd5b1b8a4d8b9110c0
parent e52a4e39

src/com/android/launcher3/Workspace.java

+3 −2
Original line number Diff line number Diff line
@@ -687,8 +687,9 @@ public class Workspace extends PagedView<WorkspacePageIndicator> 
        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);