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

Commit 060a4837 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in case where workspace is null because Launcher has been... 

Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf
parents a6a296ba 37c717ff

src/com/android/launcher3/Launcher.java

+1 −1
Original line number Diff line number Diff line
@@ -2663,7 +2663,7 @@ public class Launcher extends Activity 
    }



    public void closeFolder() {

        Folder folder = mWorkspace.getOpenFolder();

        Folder folder = mWorkspace != null ? mWorkspace.getOpenFolder() : null;

        if (folder != null) {

            if (folder.isEditingName()) {

                folder.dismissEditingName();