commit 155b2624888b2898ef35d6bd80228d83cb39bc91
author Adam Cohen <adamcohen@google.com> Fri Feb 14 21:02:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 21:02:00 2014 +0000
tree 58eed90b57f80afef8d510b367c7c34273b96b6e
parent b45d0d0a8b91f3028fbff1df64b5c3d164355265
parent d8a11572d247ab4fc90d5ff28c31c183442691bf

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

* commit 'd8a11572d247ab4fc90d5ff28c31c183442691bf':
  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();