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

Commit 70dd01be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 686d42a1 26de7be9

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