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

Commit 46db0572 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15583988

Change-Id: Ie6d11b74141ff777b10f05919b9a61f7af809900
parents 88cd9aaa 70dd01be

src/com/android/launcher3/Workspace.java

+3 −2
Original line number Diff line number Diff line
@@ -683,8 +683,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);