commit 9710ec9d85566ea1edf973f3d51dda24f64bdaaf
author Adam Cohen <adamcohen@google.com> Tue Nov 26 12:00:48 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 26 12:00:48 2013 -0800
tree 1ad7cf21fba2bf90fc86d98b637fff2e8f6c5fe0
parent 314aaeca0ca84583fd637ff398a08d7c31d9b0a5
parent 060a48378f21a6b5836990a23178d02c94fccc60

am 060a4837: Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf

* commit '060a48378f21a6b5836990a23178d02c94fccc60':
  Fix NPE in case where workspace is null because Launcher has been destroyed

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index ba3ba93..3bd796b 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2664,7 +2664,7 @@
     }
 
     public void closeFolder() {
-        Folder folder = mWorkspace.getOpenFolder();
+        Folder folder = mWorkspace != null ? mWorkspace.getOpenFolder() : null;
         if (folder != null) {
             if (folder.isEditingName()) {
                 folder.dismissEditingName();